allocate fields with pointers, rewrite yulobject and mustache interaction to reflect current object layout

Obsidian_Runtime/src/main/yul_templates/object.mustache

@@ -5,42 +5,28 @@ ethereum/solidity/libsolidity/codegen/ir/IRGenerator.cpp
 Consulting example yul code is also helpful in understanding the template.
 https://solidity.readthedocs.io/en/latest/yul.html#specification-of-yul-object
 }}
-object "{{creationObject}}" {
+object "{{contractName}}" {
     code {
         {{! init free memory pointer, see chatper "Layout in Memory" of the Solidity doc}}
         {{memoryInit}}
         {{! protection against sending Ether }}
         {{callValueCheck}}
-        {{! not impletmented by the current stage, cited from IRGenerator.cpp (link in file comment above) }}
-        {{#notLibrary}}
-            {{#constructorHasParams}} let {{constructorParams}} := {{copyConstructorArguments}}() {{/constructorHasParams}}
-            {{implicitConstructor}}({{constructorParams}})
-        {{/notLibrary}}
-        {{! todo: write and call constructor }}
-        {{#deploy}}
-            {{call}}
-        {{/deploy}}
-        {{! functions related to constructor }}
-        {{#deployFunctions}}
-            {{code}}
-        {{/deployFunctions}}
         {{codeCopy}}
         {{defaultReturn}}
     }
-    object "{{runtimeObjectName}}" {
+    object "{{deployedName}}" {
         code {
             {{! init free memory pointer, see chatper "Layout in Memory" of the Solidity doc}}
-            {{memoryInitRuntime}}
+            {{memoryInit}}
+
             {{! obtain which runtime function is called, https://solidity.readthedocs.io/en/latest/abi-spec.html#function-selector}}
 
             {{! todo: is 4 a magic number or should it be generated based on the object in question? check the ABI }}
             if iszero(lt(calldatasize(), 4)) {
-                {{#dispatch}}
-                    {{! TODO 224 is a magic number offset to shift to follow the spec above; check that it's right }}
-                    let this := address()
-                    let selector := shr(224, calldataload(0))
-                    {{dispatchCase}}
-                {{/dispatch}}
+                {{! TODO 224 is a magic number offset to shift to follow the spec above; check that it's right }}
+                let this := allocate_memory({{mainSize}})
+                let selector := shr(224, calldataload(0))
+                {{dispatchTable}}
             }
             if iszero(calldatasize()) {  }
             revert(0, 0)
@@ -101,11 +87,7 @@ object "{{creationObject}}" {
                 cleaned := value
             }
 
-            {{#runtimeFunctions}}
-                {{code}}
-            {{/runtimeFunctions}}
+            {{transactions}}
         }
-
-        {{childContracts}}
     }
 }

bin/run_any_yul.sh

@@ -39,15 +39,8 @@ then
     exit 1
 fi
 
-echo "Yul that produced the binary:"
-TOP=$(echo "$output" | grep -n "Pretty printed source:" | cut -f1 -d:)
-BOT=$(echo "$output" | grep -n "Binary representation:" | cut -f1 -d:)
-TOP=$((TOP+1)) # drop the line with the name
-BOT=$((BOT-2)) # drop the empty line after the binary
-echo -ne "$output" | sed -n $TOP','$BOT'p' | bat -l javascript --style=plain -P
-
 TOP=$(echo "$output" | grep -n "Binary representation" | cut -f1 -d:)
-BOT=$(echo "$output" | grep -n "Text representation" | cut -f1 -d:)
+BOT=$(echo "$output" | wc -l | awk '{print $1}' )
 TOP=$((TOP+1)) # drop the line with the name
 BOT=$((BOT-1)) # drop the empty line after the binary
 EVM_BIN=$(echo "$output" | sed -n $TOP','$BOT'p' )

resources/tests/GanacheTests/SetGetPointer.json

@@ -0,0 +1,8 @@
+{
+    "gas" : 30000000,
+    "gasprice" : "0x9184e72a000",
+    "startingeth" : 5000000,
+    "numaccts" : 1,
+    "testexp" : "main()",
+    "expected" : "1800"
+}

resources/tests/GanacheTests/SetGetPointer.obs

@@ -0,0 +1,34 @@
+contract IntContainer{
+    int x;
+    int y;
+    int z;
+    int f;
+
+    transaction set() {
+        x = -1;
+        f = -1;
+        z = -1;
+        y = -1;
+        x = 5;
+        y = 10;
+        z = 4;
+        f = 9;
+    }
+
+    transaction get() returns int{
+        return x*y*z*f; // 1800
+    }
+}
+
+
+// this differs from the test in SG.obs in that the main contract
+// not only has a field  but that field is at a non-primitive type
+main contract SetGetPointer {
+    IntContainer@Owned ic;
+
+    transaction main() returns int{
+        ic = new IntContainer();
+        ic.set();
+        return ic.get();
+    }
+}