Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@krame505
krame505 committed Oct 26, 2017
2 parents 1ef9ae0 + 4650fc3 commit afc9b29
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 24 deletions.
15 changes: 10 additions & 5 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,12 @@ properties([
/* a node allocates an executor to actually do work */
node {
try {
// notifyBuild('STARTED')
// notifyBuild('STARTED')

def env = [
"PATH=${params.SILVER_BASE}/support/bin/:${params.SILVER_BASE}/support/nailgun/:${env.PATH}",
"SVFLAGS=-G ${WORKSPACE}/generated"
]

/* stages are pretty much just labels about what's going on */
stage ("Build") {
Expand All @@ -52,15 +57,15 @@ node {
sh "mkdir -p generated"

/* env.PATH is the master's path, not the executor's */
withEnv(["PATH=${params.SILVER_BASE}/support/bin/:${env.PATH}"]) {
sh "./build -G generated --warn-all --warn-error"
withEnv(env) {
sh "./build -G ${WORKSPACE}/generated --warn-all --warn-error"
}
}

/* Make sure the tutorials compile before bothering to build all the other extensions */
stage ("Tutorials") {
dir("tutorials") {
withEnv(["PATH=${params.SILVER_BASE}/support/bin/:${env.PATH}"]) {
withEnv(env) {
sh "./build-all"
}
}
Expand Down Expand Up @@ -129,7 +134,7 @@ node {
*/
stage ("Test") {
dir("testing/expected-results") {
withEnv(["PATH=${params.SILVER_BASE}/support/nailgun/:${env.PATH}"]) {
withEnv(env) {
sh "./runTests"
}
}
Expand Down
4 changes: 2 additions & 2 deletions edu.umn.cs.melt.ableC/abstractsyntax/host/ExprUnaryOps.sv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ top::Expr ::= e::Expr
propagate host, lifted;
top.pp = parens( cat(text("*"), e.pp) );
top.typerep =
case e.typerep of
case e.typerep.defaultFunctionArrayLvalueConversion of
| pointerType(_, innerty) -> innerty
| _ -> errorType()
end;
Expand All @@ -97,7 +97,7 @@ top::Expr ::= e::Expr
top.isLValue = true;

top.errors <-
-- TODO: This error check will need to change for ext host types
-- TODO: This error check may need to change for ext host types
case e.typerep.defaultFunctionArrayLvalueConversion of
| pointerType(_, _) -> []
| _ -> [err(top.location, "invalid type argument of unary ‘*’ (have ‘" ++
Expand Down
4 changes: 2 additions & 2 deletions tutorials/construction/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ ABLEC_JAR=ableC.jar
ARTIFACT=artifact
GRAMMAR_DIRS=. ../../
GRAMMAR_SOURCES=$(shell find $(GRAMMAR_DIRS) -name *.sv -print0 | xargs -0)
SVFLAGS=$(addprefix -I , $(GRAMMAR_DIRS))
override SVFLAGS+=$(addprefix -I , $(GRAMMAR_DIRS))

XC_FILES=$(wildcard *.xc)
C_FILES=$(XC_FILES:.xc=.c)
OBJECTS=$(XC_FILES:.xc=.o)
EXECUTABLES=$(XC_FILES:.xc=.out)
TESTS=$(XC_FILES:.xc=.test)

JAVAFLAGS=-Xss6M
override JAVAFLAGS+=-Xss6M

all: $(ABLEC_JAR) $(C_FILES) $(OBJECTS) $(EXECUTABLES) $(TESTS)

Expand Down
4 changes: 2 additions & 2 deletions tutorials/declarations/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ ABLEC_JAR=ableC.jar
ARTIFACT=artifact
GRAMMAR_DIRS=. ../../
GRAMMAR_SOURCES=$(shell find $(GRAMMAR_DIRS) -name *.sv -print0 | xargs -0)
SVFLAGS=$(addprefix -I , $(GRAMMAR_DIRS))
override SVFLAGS+=$(addprefix -I , $(GRAMMAR_DIRS))

XC_FILES=$(wildcard *.xc)
C_FILES=$(XC_FILES:.xc=.c)
OBJECTS=$(XC_FILES:.xc=.o)
EXECUTABLES=$(XC_FILES:.xc=.out)
TESTS=$(XC_FILES:.xc=.test)

JAVAFLAGS=-Xss6M
override JAVAFLAGS+=-Xss6M

all: $(ABLEC_JAR) $(C_FILES) $(OBJECTS) $(EXECUTABLES) $(TESTS)

Expand Down
4 changes: 2 additions & 2 deletions tutorials/embedded_dsl/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ ABLEC_JAR=ableC.jar
ARTIFACT=artifact
GRAMMAR_DIRS=. ../../
GRAMMAR_SOURCES=$(shell find $(GRAMMAR_DIRS) -name *.sv -print0 | xargs -0)
SVFLAGS=$(addprefix -I , $(GRAMMAR_DIRS))
override SVFLAGS+=$(addprefix -I , $(GRAMMAR_DIRS))

XC_FILES=$(wildcard *.xc)
C_FILES=$(XC_FILES:.xc=.c)
OBJECTS=$(XC_FILES:.xc=.o)
EXECUTABLES=$(XC_FILES:.xc=.out)
TESTS=$(XC_FILES:.xc=.test)

JAVAFLAGS=-Xss6M
override JAVAFLAGS+=-Xss6M

all: $(ABLEC_JAR) $(C_FILES) $(OBJECTS) $(EXECUTABLES) $(TESTS)

Expand Down
4 changes: 2 additions & 2 deletions tutorials/error_checking/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ ABLEC_JAR=ableC.jar
ARTIFACT=artifact
GRAMMAR_DIRS=. ../../
GRAMMAR_SOURCES=$(shell find $(GRAMMAR_DIRS) -name *.sv -print0 | xargs -0)
SVFLAGS=$(addprefix -I , $(GRAMMAR_DIRS))
override SVFLAGS+=$(addprefix -I , $(GRAMMAR_DIRS))

XC_FILES=$(wildcard *.xc)
C_FILES=$(XC_FILES:.xc=.c)
OBJECTS=$(XC_FILES:.xc=.o)
EXECUTABLES=$(XC_FILES:.xc=.out)
TESTS=$(XC_FILES:.xc=.test)

JAVAFLAGS=-Xss6M
override JAVAFLAGS+=-Xss6M

all: $(ABLEC_JAR) $(C_FILES) $(OBJECTS) $(EXECUTABLES) $(TESTS)

Expand Down
4 changes: 2 additions & 2 deletions tutorials/extended_env/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ ABLEC_JAR=ableC.jar
ARTIFACT=artifact
GRAMMAR_DIRS=. ../../
GRAMMAR_SOURCES=$(shell find $(GRAMMAR_DIRS) -name *.sv -print0 | xargs -0)
SVFLAGS=$(addprefix -I , $(GRAMMAR_DIRS))
override SVFLAGS+=$(addprefix -I , $(GRAMMAR_DIRS))

XC_FILES=$(wildcard *.xc)
C_FILES=$(XC_FILES:.xc=.c)
OBJECTS=$(XC_FILES:.xc=.o)
EXECUTABLES=$(XC_FILES:.xc=.out)
TESTS=$(XC_FILES:.xc=.test)

JAVAFLAGS=-Xss6M
override JAVAFLAGS+=-Xss6M

all: $(ABLEC_JAR) $(C_FILES) $(OBJECTS) $(EXECUTABLES) $(TESTS)

Expand Down
4 changes: 2 additions & 2 deletions tutorials/getting_started/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ ABLEC_JAR=ableC.jar
ARTIFACT=artifact
GRAMMAR_DIRS=. ../../
GRAMMAR_SOURCES=$(shell find $(GRAMMAR_DIRS) -name *.sv -print0 | xargs -0)
SVFLAGS=$(addprefix -I , $(GRAMMAR_DIRS))
override SVFLAGS+=$(addprefix -I , $(GRAMMAR_DIRS))

XC_FILES=$(wildcard *.xc)
C_FILES=$(XC_FILES:.xc=.c)
OBJECTS=$(XC_FILES:.xc=.o)
EXECUTABLES=$(XC_FILES:.xc=.out)
TESTS=$(XC_FILES:.xc=.test)

JAVAFLAGS=-Xss6M
override JAVAFLAGS+=-Xss6M

all: $(ABLEC_JAR) $(C_FILES) $(OBJECTS) $(EXECUTABLES) $(TESTS)

Expand Down
4 changes: 2 additions & 2 deletions tutorials/lifting/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ ABLEC_JAR=ableC.jar
ARTIFACT=artifact
GRAMMAR_DIRS=. ../../
GRAMMAR_SOURCES=$(shell find $(GRAMMAR_DIRS) -name *.sv -print0 | xargs -0)
SVFLAGS=$(addprefix -I , $(GRAMMAR_DIRS))
override SVFLAGS+=$(addprefix -I , $(GRAMMAR_DIRS))

XC_FILES=$(wildcard *.xc)
C_FILES=$(XC_FILES:.xc=.c)
OBJECTS=$(XC_FILES:.xc=.o)
EXECUTABLES=$(XC_FILES:.xc=.out)
TESTS=$(XC_FILES:.xc=.test)

JAVAFLAGS=-Xss6M
override JAVAFLAGS+=-Xss6M

all: $(ABLEC_JAR) $(C_FILES) $(OBJECTS) $(EXECUTABLES) $(TESTS)

Expand Down
6 changes: 3 additions & 3 deletions tutorials/overloading/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ ABLEC_JAR=ableC.jar
ARTIFACT=artifact
GRAMMAR_DIRS=. ../../
GRAMMAR_SOURCES=$(shell find $(GRAMMAR_DIRS) -name *.sv -print0 | xargs -0)
SVFLAGS=$(addprefix -I , $(GRAMMAR_DIRS))
override SVFLAGS+=$(addprefix -I , $(GRAMMAR_DIRS))

XC_FILES=$(wildcard *.xc)
C_FILES=$(XC_FILES:.xc=.c)
OBJECTS=$(XC_FILES:.xc=.o)
EXECUTABLES=$(XC_FILES:.xc=.out)
TESTS=$(XC_FILES:.xc=.test)

XCFLAGS=-I include
JAVAFLAGS=-Xss6M
override XCFLAGS+=-I include
override JAVAFLAGS+=-Xss6M

all: $(ABLEC_JAR) $(C_FILES) $(OBJECTS) $(EXECUTABLES) $(TESTS)

Expand Down

0 comments on commit afc9b29

Please sign in to comment.