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

Fix java kore parser #2766

Merged
merged 1 commit into from
Aug 2, 2022
Merged

Fix java kore parser #2766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions k-distribution/tests/regression-new/issue-1682-korePrettyPrint/2.kast
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
inj { SortBool { }, SortKItem { } } ( Lblpred1 { } ( \dv { SortInt { } } ( "3" ) ) )
1 change: 1 addition & 0 deletions k-distribution/tests/regression-new/issue-1682-korePrettyPrint/2.kast.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pred1(#token("3","Int"))
1 change: 1 addition & 0 deletions k-distribution/tests/regression-new/issue-1682-korePrettyPrint/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ TESTDIR=.
KOMPILE_BACKEND=haskell
KRUN_FLAGS=--output kore
KOMPILE_FLAGS=--syntax-module TEST
KAST_FLAGS=--input kore

include ../../../include/kframework/ktest.mak
# force krun instead of kx
Expand Down
1 change: 1 addition & 0 deletions k-distribution/tests/regression-new/issue-1682-korePrettyPrint/test.k
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ module TEST
syntax X ::= "a"
configuration <k> $PGM:X </k>
rule <k> a => ?_:Int </k>
syntax Bool ::= pred1 ( Int ) [function, functional, klabel(pred1), symbol, no-evaluators]
endmodule
2 changes: 1 addition & 1 deletion kore/src/main/scala/org/kframework/parser/kore/parser/TextToKore.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ class TextToKore(b: Builders = DefaultBuilders) {
// Sort = SortVariable | Name { List{Sort, ",", ")"} }
private def parseSort(parsingLevel: ParsingLevel = both): Sort = {
val name = parseId(parsingLevel)
scanner.next() match {
scanner.nextWithSkippingWhitespaces() match {
case '{' =>
if (previousParsingLevel == meta) { // name is a meta-level id
val metalevelSorts = Seq("#Char", "#CharList", "#String", "#Sort", "#SortList",
Expand Down