Merge branch 'develop' into test-develop-workflow

runtimeverification · Sep 21, 2023 · 0231722 · 0231722
2 parents 5f5cad0 + 8200fdb
commit 0231722
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/k-distribution/pl-tutorial/1_k/4_imp++/lesson_6/tests/spawn.imp.out b/k-distribution/pl-tutorial/1_k/4_imp++/lesson_6/tests/spawn.imp.out
@@ -1,13 +1,13 @@
     {
       Out:String
     #Equals
-      "x = 21\n"
+      "x = 11\n"
     }
   #And
     {
       Store:Map
     #Equals
-      0 |-> 21
+      0 |-> 11
     }
 #Or
     {
@@ -19,7 +19,7 @@
     {
       Store:Map
     #Equals
-      0 |-> 11
+      0 |-> 21
     }
 #Or
     {
@@ -31,31 +31,31 @@
     {
       Store:Map
     #Equals
-      0 |-> 21
+      0 |-> 33
     }
 #Or
     {
       Out:String
     #Equals
-      "x = 11\n"
+      "x = 16\n"
     }
   #And
     {
       Store:Map
     #Equals
-      0 |-> 33
+      0 |-> 16
     }
 #Or
     {
       Out:String
     #Equals
-      "x = 16\n"
+      "x = 21\n"
     }
   #And
     {
       Store:Map
     #Equals
-      0 |-> 16
+      0 |-> 21
     }
 #Or
     {

diff --git a/llvm-backend/src/main/native/llvm-backend b/llvm-backend/src/main/native/llvm-backend
+1 −6		bin/utils.sh
+4 −3		lib/ast/AST.cpp
+4 −4		nix/llvm-backend.nix
+1 −0		test/lit.cfg.py
+35 −0		test/unparse/sort/bottomup.cfg.kore
+35 −0		test/unparse/sort/bottomup.cfg.kore.out
+1,555 −0		test/unparse/sort/equals.cfg.kore
+143 −0		test/unparse/sort/equals.cfg.kore.out
+1 −0		test/unparse/sort/macros.kore
+598 −0		test/unparse/sort/syntaxDefinition.kore