Minor optimizations (#31)

* optimize decision tree heuristic

* optimize isKResult

* discard events for now rather than printing them

* use bison parser for config var

* update out files

Makefile

@@ -23,7 +23,7 @@ TRANSACTIONS = $(shell find $(TRANSACTIONS_DIR) -name "*.txn")
 EXAMPLE_TESTS = $(patsubst %.txn, %.out, $(TRANSACTIONS))
 
 build: $(SEMANTICS_DIR)/$(SEMANTICS_FILE)
-	kompile $(SEMANTICS_DIR)/$(SEMANTICS_FILE) --main-module $(MAIN_MODULE) --gen-glr-bison-parser -O2
+	kompile $(SEMANTICS_DIR)/$(SEMANTICS_FILE) --main-module $(MAIN_MODULE) --gen-glr-bison-parser -O2 --heuristic pbaL
 
 clean:
 	rm -Rf $(SEMANTICS_FILE_NAME)-kompiled

bin/kparse-bool

@@ -1,2 +1,2 @@
 #!/bin/bash
-kparse -d "$(dirname "$0")/../solidity-kompiled" -s Bool -m SOLIDITY-DATA-SYNTAX "$(cat "$1")"
+kparse -d "$(dirname "$0")/../solidity-kompiled" -s Bool -m BOOL-SYNTAX "$(cat "$1")"

src/solidity-syntax.md

@@ -207,7 +207,7 @@ Following is a list of supported statements.
 `CallArgumentList` keeps a list of arguments for function calls and such (`revert()`, `emit()`, etc.)
 
 ```k
-    syntax CallArgumentList ::= List{Expression, ","} [overload(exps), strict, hybrid]
+    syntax CallArgumentList ::= List{Expression, ","} [overload(exps), strict]
 
 ```
 

src/solidity.md

@@ -18,7 +18,7 @@ module SOLIDITY-CONFIGURATION
   configuration
     <solidity>
       <k parser="TXN, SOLIDITY-DATA-SYNTAX"> $PGM:Program ~> $TXN:Transactions </k>
-      <summarize> $ISUNISWAP:Bool </summarize>
+      <summarize parser="ISUNISWAP, BOOL-SYNTAX"> $ISUNISWAP:Bool </summarize>
       <compile>
         <current-body> Id </current-body>
         <ifaces>
@@ -117,10 +117,10 @@ module SOLIDITY-DATA
   syntax Id ::= "constructor" [token]
 
   syntax TypedVal ::= v(Value, TypeName) | lv(BaseRef, List, TypeName) | Int | String | "void"
-  syntax TypedVals ::= List{TypedVal, ","} [overload(exps), hybrid, strict]
+  syntax TypedVals ::= List{TypedVal, ","} [overload(exps), strict]
   syntax Expression ::= TypedVal
   syntax CallArgumentList ::= TypedVals
-  syntax KResult ::= TypedVal
+  syntax KResult ::= TypedVal | TypedVals
   syntax Value ::= MInt{8} | MInt{32} | MInt{112} | MInt{160} | MInt{256} | Bool | String | List | Map
   syntax BaseRef ::= Id | Int
 

src/statement.md

@@ -54,7 +54,7 @@ module SOLIDITY-STATEMENT
        <store> S => S [ !I <- default(T) ] </store>
 
   // emit statement
-  rule <k> emit X:Id ( ARGS ) ; => #log(Event2String(ARGS, ((.StringBuffer +String Id2String(X)) +String "("))) ...</k>
+  rule <k> emit X:Id ( ARGS ) ; => discard(Event2String(ARGS, ((.StringBuffer +String Id2String(X)) +String "("))) ...</k>
     requires isKResult(ARGS)
 
   syntax String ::= Event2String(CallArgumentList, StringBuffer) [function]
@@ -65,6 +65,8 @@ module SOLIDITY-STATEMENT
   rule Event2String(v(V:MInt{112}, _), ARGS, SB) => Event2String(ARGS, (SB +String Int2String(MInt2Unsigned(V))) +String ", ") [owise]
   rule Event2String(v(V:MInt{160}, _), ARGS, SB) => Event2String(ARGS, (SB +String Int2String(MInt2Unsigned(V))) +String ", ") [owise]
   rule Event2String(v(V:MInt{256}, _), ARGS, SB) => Event2String(ARGS, (SB +String Int2String(MInt2Unsigned(V))) +String ", ") [owise]
+  syntax K ::= discard(String) [function]
+  rule discard(_) => .K
 
   // if statement
   rule if ( v(true, bool ) ) S => S

test/regression/emit.ref

@@ -1,4 +1,3 @@
-Approval(1, 0, 2)
 <solidity>
   <k>
     .K