Uniswap: summary of initialization of configuration

Makefile

@@ -82,6 +82,6 @@ $(REGRESSION_TESTS): %.out: %.sol %.txn %.ref $(SEMANTICS_FILE_NAME)-kompiled/ti
 test-examples: ${EXAMPLE_TESTS}
 
 .SECONDEXPANSION:
-$(EXAMPLE_TESTS): %.out: $$(subst $(TRANSACTIONS_DIR), $(EXAMPLES_DIR), $$(@D)).sol %.txn %.ref $(SEMANTICS_FILE_NAME)-kompiled/timestamp
-	ulimit -s 65536 && bin/krun-sol $< $*.txn > $*.out 2>&1
+$(EXAMPLE_TESTS): %.out: $$(subst $(TRANSACTIONS_DIR), $(EXAMPLES_DIR), $$(@D)).sol %.txn %.ref %.smr $(SEMANTICS_FILE_NAME)-kompiled/timestamp
+	ulimit -s 65536 && bin/krun-sol $< $*.txn $*.smr > $*.out 2>&1
 	diff -U3 -w $*.ref $*.out

bin/kparse-bool

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

bin/krun-sol

@@ -1,5 +1,17 @@
 #!/bin/bash
 contract="$1"
 txn="$2"
+
+if [ "$#" -lt 3 ]; then
+    isuniswap=""
+else
+    isuniswap="$3"
+    shift
+fi
 shift; shift
-krun -d "$(dirname "$0")/../solidity-kompiled" "$contract" -cTXN="$txn" -pTXN="$(dirname "$0")/kparse-txn" --no-expand-macros "$@"
+
+if [ -z "${isuniswap}" ]; then
+    krun -d "$(dirname "$0")/../solidity-kompiled" "$contract" -cTXN="$txn" -pTXN="$(dirname "$0")/kparse-txn" -cISUNISWAP="false" --no-expand-macros "$@"
+else
+    krun -d "$(dirname "$0")/../solidity-kompiled" "$contract" -cTXN="$txn" -pTXN="$(dirname "$0")/kparse-txn" -cISUNISWAP="$isuniswap" -pISUNISWAP="$(dirname "$0")/kparse-bool" --no-expand-macros "$@"
+fi

src/solidity.md

@@ -7,6 +7,7 @@ requires "contract.md"
 requires "transaction.md"
 requires "expression.md"
 requires "statement.md"
+requires "uniswap-summaries.md"
 
 module SOLIDITY-CONFIGURATION
   imports SOLIDITY-DATA
@@ -17,6 +18,7 @@ module SOLIDITY-CONFIGURATION
   configuration
     <solidity>
       <k parser="TXN, SOLIDITY-DATA-SYNTAX"> $PGM:Program ~> $TXN:Transactions </k>
+      <summarize> $ISUNISWAP:Bool </summarize>
       <compile>
         <current-body> Id </current-body>
         <ifaces>
@@ -178,8 +180,10 @@ module SOLIDITY
   imports SOLIDITY-TRANSACTION
   imports SOLIDITY-EXPRESSION
   imports SOLIDITY-STATEMENT
+  imports SOLIDITY-UNISWAP-INIT-SUMMARY
 
-  rule _:PragmaDefinition Ss:SourceUnits => Ss
+  rule <k> _:PragmaDefinition Ss:SourceUnits => Ss ...</k>
+       <summarize> false </summarize>
   rule S:SourceUnit Ss:SourceUnits => S ~> Ss
   rule .SourceUnits => .K
   rule C:ContractBodyElement Cc:ContractBodyElements => C ~> Cc

test/regression/arithmetic.ref

@@ -2,6 +2,9 @@
   <k>
     .K
   </k>
+  <summarize>
+    false
+  </summarize>
   <compile>
     <current-body>
       TestArithmetic

test/regression/arraystestcontract.ref

@@ -2,6 +2,9 @@
   <k>
     .K
   </k>
+  <summarize>
+    false
+  </summarize>
   <compile>
     <current-body>
       TestArraysContract

test/regression/block.ref

@@ -2,6 +2,9 @@
   <k>
     .K
   </k>
+  <summarize>
+    false
+  </summarize>
   <compile>
     <current-body>
       BlockTest

test/regression/boolean.ref

@@ -2,6 +2,9 @@
   <k>
     .K
   </k>
+  <summarize>
+    false
+  </summarize>
   <compile>
     <current-body>
       BoolTest

test/regression/contract.ref

@@ -2,6 +2,9 @@
   <k>
     .K
   </k>
+  <summarize>
+    false
+  </summarize>
   <compile>
     <current-body>
       UniswapV2Swap

test/regression/emit.ref

@@ -3,6 +3,9 @@ Approval(1, 0, 2)
   <k>
     .K
   </k>
+  <summarize>
+    false
+  </summarize>
   <compile>
     <current-body>
       EmitTest

test/regression/eventtestcontract.ref

@@ -2,6 +2,9 @@
   <k>
     .K
   </k>
+  <summarize>
+    false
+  </summarize>
   <compile>
     <current-body>
       TestEventsContract

test/regression/for.ref

@@ -2,6 +2,9 @@
   <k>
     .K
   </k>
+  <summarize>
+    false
+  </summarize>
   <compile>
     <current-body>
       ForTest

test/regression/function.ref

@@ -2,6 +2,9 @@
   <k>
     .K
   </k>
+  <summarize>
+    false
+  </summarize>
   <compile>
     <current-body>
       UniswapV2SwapTest

test/regression/if.ref

@@ -2,6 +2,9 @@
   <k>
     .K
   </k>
+  <summarize>
+    false
+  </summarize>
   <compile>
     <current-body>
       IfTest

test/regression/increment.ref

@@ -2,6 +2,9 @@
   <k>
     .K
   </k>
+  <summarize>
+    false
+  </summarize>
   <compile>
     <current-body>
       IncTest

test/regression/mapstestcontract.ref

@@ -2,6 +2,9 @@
   <k>
     .K
   </k>
+  <summarize>
+    false
+  </summarize>
   <compile>
     <current-body>
       TestMapsContract

test/regression/swaps.ref

@@ -15002,6 +15002,9 @@ Swap(7, 1000000000000000000, 0, 0, 332669001559828603, 2)
   <k>
     .K
   </k>
+  <summarize>
+    false
+  </summarize>
   <compile>
     <current-body>
       UniswapV2SwapTest

test/transactions/swaps/UniswapV2Swap/UniswapTest.ref

@@ -99,6 +99,9 @@ Transfer(6, 2, 1999999999998955749)
   <k>
     .K
   </k>
+  <summarize>
+    false
+  </summarize>
   <compile>
     <current-body>
       UniswapV2SwapTest

test/transactions/swaps/UniswapV2Swap/UniswapTest.smr

@@ -0,0 +1 @@
+false

test/transactions/swaps/UniswapV2SwapRenamed/UniswapTestRenamed.ref

@@ -99,6 +99,9 @@ transferEvent(6, 2, 1999999999998955749)
   <k>
     .K
   </k>
+  <summarize>
+    true
+  </summarize>
   <compile>
     <current-body>
       uniswapV2SwapTest

test/transactions/swaps/UniswapV2SwapRenamed/UniswapTestRenamed.smr

@@ -0,0 +1 @@
+true