Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update from updated master #2

Open
wants to merge 51 commits into
base: shell-config
Choose a base branch
from
Open

Update from updated master #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
61135c4
Update to new project configuration (dynsem.properties) and entrypoint
Balletie Jun 6, 2016
1a2a428
Update for DynSem (Spoofax 2.1.0)
vvergu Aug 4, 2016
575a8ef
Update specification for DynSem changes in semantic component handling.
vvergu Oct 7, 2016
b92ad4c
Explicitly declare semantic components on the arrows for natively imp…
vvergu Oct 13, 2016
27b22ec
Merge pull request #3 from MetaBorgCube/ds/new-explication
vvergu Oct 14, 2016
d4e7476
Add missing libspoofax dependency
vvergu Nov 8, 2016
b222431
Fix incorrect imports
vvergu Nov 24, 2016
35a8d4e
Minor non-semantic changes
vvergu Nov 25, 2016
cc8a111
Fix read line primitive
vvergu Nov 25, 2016
5cf34dd
Extract string literals into constants
vvergu Nov 25, 2016
d044f87
Fix test case to allow hooking into test suite
vvergu Nov 25, 2016
54dd55c
Change loopspec rule to allow RTCO for that rule
vvergu Nov 25, 2016
8b33649
Clean readln native operator
vvergu Nov 25, 2016
58aadd7
Add vmargs DynSem configuration
vvergu Nov 25, 2016
439ec2b
Modifications to generated .gitignore and POM
vvergu Nov 25, 2016
9117c8d
Fix incorrect Maven Surefire version
vvergu Nov 25, 2016
f65ac61
Add standalone build profile for builds in Travis
vvergu Nov 28, 2016
e0228fa
Add correct dependencies to POM file
vvergu Nov 28, 2016
a84140b
Generate interpreter as part of the test build phase
vvergu Nov 28, 2016
a65fd25
Add standalone profile to interpreter POM
vvergu Nov 28, 2016
c5507aa
Update m2e-apt settings
vvergu Nov 28, 2016
b475ac8
POM format
vvergu Nov 29, 2016
3d95fdb
Remove manually implemented test suite because DynSem can now generat…
vvergu Dec 6, 2016
e2e79bf
Commit updated POM file
vvergu Dec 6, 2016
1e96e9c
Update pom
vvergu Dec 6, 2016
0b2b476
Cleanup .settings and pom file. DynSem can now generate the correct j…
vvergu Dec 6, 2016
df93814
Fix test expectation files to work with the new test runner
vvergu Dec 6, 2016
4938742
Update generated .gitignore file
vvergu Dec 7, 2016
b2a79c7
Remove obsolete shell script
vvergu Dec 8, 2016
9b7bd96
Update git ignores
vvergu Dec 8, 2016
599729b
Some specification pretty-fication
vvergu Dec 8, 2016
f5f39cb
Add test for logical operations
vvergu Dec 8, 2016
5e9a93d
Intentionally destroy the semantics
vvergu Dec 8, 2016
be40d4a
Factor out the biginteger arithmetics
vvergu Dec 8, 2016
438b674
Break boolean semantics
vvergu Dec 8, 2016
067d2a6
Fix Neq semantics
vvergu Dec 8, 2016
94b8522
Reenable slow tests
vvergu Dec 8, 2016
bb478b8
Update test expections for the updated expectations of the generated …
vvergu Dec 9, 2016
083982e
Lift main semantics module
vvergu Dec 9, 2016
40fe82f
Update native rules to have new name replacing the default arrow
vvergu Dec 9, 2016
930152b
Update generate interpreter builder name
vvergu Dec 12, 2016
8dad649
Fix pom file to point to the correct main DynSem module
vvergu Dec 12, 2016
31b0fb2
Update metaborg dependency to latest development version (2.2.0)
vvergu Jan 12, 2017
da948ab
Fix import to libspoofax refactoring
vvergu Feb 6, 2017
4512de7
Update imports for 2.2.0 libspoofax
vvergu Feb 6, 2017
2084525
Explicitly wrap the Block term in injection constructor to make analy…
vvergu Feb 6, 2017
dd72655
Update SL to Spoofax 2.3.0-SNAP
vvergu Apr 19, 2017
1364294
Update specification to remove trailing dots at end of rules
vvergu Apr 20, 2017
f6e004e
Rename interpreter project artifact and package to include the “lang”…
vvergu May 29, 2017
099a033
Merge remote-tracking branch 'cube/master'
vvergu May 29, 2017
82d4070
Merge branch 'master' into shell-config
vvergu May 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
org.metaborg.lang.sl.interp/pom.xml
org.metaborg.lang.sl.interp/.settings/org.eclipse.jdt.apt.core.prefs
org.metaborg.lang.sl.interp/.settings/org.eclipse.jdt.core.prefs
org.metaborg.lang.sl.interp/.settings/org.eclipse.m2e.core.prefs
org.metaborg.lang.sl.interp/.settings/org.jboss.tools.maven.apt.prefs
68 changes: 45 additions & 23 deletions org.metaborg.lang.sl.interp/.factorypath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,52 @@
<factorypath>
<factorypathentry kind="VARJAR" id="M2_REPO/com/github/krukow/clj-ds/0.0.4/clj-ds-0.0.4.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/metaborg/org.strategoxt.strj/2.0.0-SNAPSHOT/org.strategoxt.strj-2.0.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/metaborg/org.spoofax.interpreter.core/2.0.0-SNAPSHOT/org.spoofax.interpreter.core-2.0.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/metaborg/org.spoofax.interpreter.library.xml/2.0.0-SNAPSHOT/org.spoofax.interpreter.library.xml-2.0.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/metaborg/org.spoofax.interpreter.library.java/2.0.0-SNAPSHOT/org.spoofax.interpreter.library.java-2.0.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/metaborg/org.spoofax.interpreter.library.index/2.0.0-SNAPSHOT/org.spoofax.interpreter.library.index-2.0.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/metaborg/org.metaborg.util/2.0.0-SNAPSHOT/org.metaborg.util-2.0.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-vfs2/2.0/commons-vfs2-2.0.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/netflix/rxjava/rxjava-core/0.19.6/rxjava-core-0.19.6.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/google/inject/guice/3.0/guice-3.0.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/metaborg/org.strategoxt.strj/2.3.0-SNAPSHOT/org.strategoxt.strj-2.3.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/metaborg/org.spoofax.interpreter.core/2.3.0-SNAPSHOT/org.spoofax.interpreter.core-2.3.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/metaborg/org.spoofax.interpreter.library.xml/2.3.0-SNAPSHOT/org.spoofax.interpreter.library.xml-2.3.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/metaborg/org.spoofax.interpreter.library.java/2.3.0-SNAPSHOT/org.spoofax.interpreter.library.java-2.3.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/metaborg/org.spoofax.interpreter.library.index/2.3.0-SNAPSHOT/org.spoofax.interpreter.library.index-2.3.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/metaborg/org.spoofax.jsglr/2.3.0-SNAPSHOT/org.spoofax.jsglr-2.3.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/metaborg/sdf2table/2.3.0-SNAPSHOT/sdf2table-2.3.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/metaborg/org.spoofax.interpreter.library.jsglr/2.3.0-SNAPSHOT/org.spoofax.interpreter.library.jsglr-2.3.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/metaborg/strategoxt-min-jar/2.3.0-SNAPSHOT/strategoxt-min-jar-2.3.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/metaborg/org.metaborg.core/2.3.0-SNAPSHOT/org.metaborg.core-2.3.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/metaborg/org.metaborg.util/2.3.0-SNAPSHOT/org.metaborg.util-2.3.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/junit/junit/4.12/junit-4.12.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/google/inject/guice/4.0/guice-4.0.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/javax/inject/javax.inject/1/javax.inject-1.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/slf4j/slf4j-api/1.7.10/slf4j-api-1.7.10.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/junit/junit/4.11/junit-4.11.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/google/inject/extensions/guice-multibindings/4.0/guice-multibindings-4.0.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-vfs2/2.1/commons-vfs2-2.1.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/commons-logging/commons-logging/1.2/commons-logging-1.2.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-configuration2/2.0/commons-configuration2-2.0.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/virtlink/commons/commons-configuration2-jackson/0.6.1/commons-configuration2-jackson-0.6.1.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/fasterxml/jackson/core/jackson-core/2.7.5/jackson-core-2.7.5.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/fasterxml/jackson/core/jackson-databind/2.7.5/jackson-databind-2.7.5.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/fasterxml/jackson/core/jackson-annotations/2.7.5/jackson-annotations-2.7.5.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.7.5/jackson-dataformat-yaml-2.7.5.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/yaml/snakeyaml/1.15/snakeyaml-1.15.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/google/guava/guava/17.0/guava-17.0.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/metaborg/org.spoofax.jsglr/2.0.0-SNAPSHOT/org.spoofax.jsglr-2.0.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/metaborg/org.spoofax.interpreter.library.jsglr/2.0.0-SNAPSHOT/org.spoofax.interpreter.library.jsglr-2.0.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/metaborg/strategoxt-min-jar/2.0.0-SNAPSHOT/strategoxt-min-jar-2.0.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/metaborg/dynsem.lib.stratego.javastrat/2.0.0-SNAPSHOT/dynsem.lib.stratego.javastrat-2.0.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/metaborg/dynsem.lib.stratego.jar/2.0.0-SNAPSHOT/dynsem.lib.stratego.jar-2.0.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/netflix/rxjava/rxjava-core/0.20.7/rxjava-core-0.20.7.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/it/unimi/dsi/fastutil/7.0.12/fastutil-7.0.12.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/metaborg/org.metaborg.spoofax.core/2.3.0-SNAPSHOT/org.metaborg.spoofax.core-2.3.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/metaborg/org.metaborg.meta.nabl2.java/2.3.0-SNAPSHOT/org.metaborg.meta.nabl2.java-2.3.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/pcollections/pcollections/2.1.2/pcollections-2.1.2.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/metaborg/org.metaborg.runtime.task/2.3.0-SNAPSHOT/org.metaborg.runtime.task-2.3.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/metaborg/org.spoofax.terms.typesmart/2.3.0-SNAPSHOT/org.spoofax.terms.typesmart-2.3.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/metaborg/dynsem.lib.stratego.javastrat/2.3.0-SNAPSHOT/dynsem.lib.stratego.javastrat-2.3.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/metaborg/dynsem.lib.stratego.jar/2.3.0-SNAPSHOT/dynsem.lib.stratego.jar-2.3.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-lang3/3.3.2/commons-lang3-3.3.2.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/commons-io/commons-io/2.4/commons-io-2.4.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/oracle/truffle/truffle-api/0.11/truffle-api-0.11.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/oracle/truffle/truffle-dsl-processor/0.11/truffle-dsl-processor-0.11.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/metaborg/org.spoofax.terms/2.0.0-SNAPSHOT/org.spoofax.terms-2.0.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/commons-io/commons-io/2.5/commons-io-2.5.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/mockito/mockito-core/2.0.76-beta/mockito-core-2.0.76-beta.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/net/bytebuddy/byte-buddy/1.4.3/byte-buddy-1.4.3.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/objenesis/objenesis/2.4/objenesis-2.4.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/oracle/truffle/truffle-api/0.15/truffle-api-0.15.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/oracle/truffle/truffle-dsl-processor/0.15/truffle-dsl-processor-0.15.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/metaborg/org.spoofax.terms/2.3.0-SNAPSHOT/org.spoofax.terms-2.3.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/martiansoftware/nailgun-server/0.9.1/nailgun-server-0.9.1.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/slf4j/slf4j-api/1.7.10/slf4j-api-1.7.10.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/slf4j/jcl-over-slf4j/1.7.10/jcl-over-slf4j-1.7.10.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/ch/qos/logback/logback-classic/1.1.2/logback-classic-1.1.2.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/ch/qos/logback/logback-core/1.1.2/logback-core-1.1.2.jar" enabled="true" runInBatchMode="false"/>
</factorypath>
18 changes: 16 additions & 2 deletions org.metaborg.lang.sl.interp/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
/bin/

/target/
/.cache/
src/main/resources/specification.aterm
src/main/resources/parsetable.tbl
src/main/resources/logback.xml
src/main/java/org/metaborg/lang/sl/interpreter/generated
src/main/java/org/metaborg/lang/sl/interpreter/generated/terms
src/main/java/org/metaborg/lang/sl/interpreter/generated/terms/build
src/main/java/org/metaborg/lang/sl/interpreter/generated/terms/match
src/test/java/org/metaborg/lang/sl/interpreter/generated/test
/SL.launch
/TestSL.launch
/SL (Core).launch
/SL (Daemon).launch
/SL-core
/SL-server
/SL-client
/SL
3 changes: 0 additions & 3 deletions org.metaborg.lang.sl.interp/.settings/org.eclipse.jdt.apt.core.prefs
View file
Open in desktop

This file was deleted.

Loading