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.

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

Pie dsl string generation + tests #10

Merged
merged 256 commits into from
Sep 14, 2020

Conversation

MeAmAnUsername
Copy link
Contributor

Fix issues with String grammar (\ can now be followed by any character except newlines and carriage returns)
Fix issues with string generation ("$foo bar" would incorrectly generate foo + " bar", which is a type error if foo is not a string)
Add SPT tests for strings (should these go in lang.test/spt/ instead?)

field 'v' is no longer available, use getter method instead
Now gets package from module
This makes it more in line with the rest of the syntax

fixup! Remove semicolons after module and import statements
To remove ambiguity between ImportCall and QCall
…om-upstream

# Conflicts:
#	lang.test/build.gradle.kts
# Conflicts:
#	lang.test/src/test/java/mb/pie/lang/test/util/SimpleChecker.java
#	lang/trans/gen/java-ast/func_body.str
# Conflicts:
#	lang.test/src/test/java/mb/pie/lang/test/binary/add/addIntIntTestGenTest.java
#	lang.test/src/test/java/mb/pie/lang/test/binary/add/addPathPathAbsoluteRelativeTestGenTest.java
#	lang.test/src/test/java/mb/pie/lang/test/binary/add/addPathPathRelativeRelativeTestGenTest.java
#	lang.test/src/test/java/mb/pie/lang/test/binary/add/addPathStrTestGenTest.java
#	lang.test/src/test/java/mb/pie/lang/test/binary/add/addStrBoolTestGenTest.java
#	lang.test/src/test/java/mb/pie/lang/test/binary/add/addStrDataTestGenTest.java
#	lang.test/src/test/java/mb/pie/lang/test/binary/add/addStrIntTestGenTest.java
#	lang.test/src/test/java/mb/pie/lang/test/binary/add/addStrListTestGenTest.java
#	lang.test/src/test/java/mb/pie/lang/test/binary/add/addStrNullableIntNullTestGenTest.java
#	lang.test/src/test/java/mb/pie/lang/test/binary/add/addStrNullableIntValueTestGenTest.java
#	lang.test/src/test/java/mb/pie/lang/test/binary/add/addStrPathTestGenTest.java
#	lang.test/src/test/java/mb/pie/lang/test/binary/add/addStrStrTestGenTest.java
#	lang.test/src/test/java/mb/pie/lang/test/binary/add/addStrTupleTestGenTest.java
#	lang.test/src/test/java/mb/pie/lang/test/binary/add/addStrUnitTestGenTest.java
#	lang.test/src/test/java/mb/pie/lang/test/binary/land/landFalseFalseTest.java
#	lang.test/src/test/java/mb/pie/lang/test/binary/land/landFalseTrueTest.java
#	lang.test/src/test/java/mb/pie/lang/test/binary/land/landTrueFalseTest.java
#	lang.test/src/test/java/mb/pie/lang/test/binary/land/landTrueTrueTest.java
#	lang.test/src/test/java/mb/pie/lang/test/binary/lor/lorFalseFalseTest.java
#	lang.test/src/test/java/mb/pie/lang/test/binary/lor/lorFalseTrueTest.java
#	lang.test/src/test/java/mb/pie/lang/test/binary/lor/lorTrueFalseTest.java
#	lang.test/src/test/java/mb/pie/lang/test/binary/lor/lorTrueTrueTest.java
#	lang.test/src/test/java/mb/pie/lang/test/template.java.ignored
#	lang/lang.test/src/test/java/mb/pie/lang/test/binary/add/addListElem/AddListElemTest.java
#	lang/lang.test/src/test/java/mb/pie/lang/test/binary/add/addListList/AddListListTest.java
#	lang/lang.test/src/test/java/mb/pie/lang/test/binary/add/addPathPathAbsoluteAbsolute/AddPathPathAbsoluteAbsoluteTest.java
#	lang/lang.test/src/test/java/mb/pie/lang/test/binary/add/addPathPathRelativeAbsolute/AddPathPathRelativeAbsoluteTest.java
Does not pass due to negative number/id ambiguity
Copy link
Member

@Gohla Gohla left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like better string interpolation, nice!

@Gohla Gohla merged commit 574dd55 into metaborg:develop Sep 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants