From cb5cecc458bb83295d945dfa560703d358a7cc04 Mon Sep 17 00:00:00 2001
From: Kyryl Riabov <kyryl.ryabov@gmail.com>
Date: Thu, 10 Oct 2024 13:23:23 +0300
Subject: [PATCH 1/2] Fixed log and component multi dimensional array reference

---
 data/Example1.circom | 11 +++++++++++
 grammar/Circom.g4    |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/data/Example1.circom b/data/Example1.circom
index 356c22f..b1e0f12 100644
--- a/data/Example1.circom
+++ b/data/Example1.circom
@@ -58,6 +58,17 @@ template nbits(a) {
    }
    outA <== i;
 
+   log("Number: ", 100);
+
+   for(var i=0; i<2; i++)for(var idx=0; idx<CHUNK_NUMBER; idx++){
+        tmp[0][i][idx] <== add.out[i][idx] + addIsDouble * (doub.out[i][idx] - add.out[i][idx]);
+        // if a = O, then a + b = b
+        tmp[1][i][idx] <== tmp[0][i][idx] + aIsInfinity * (b[i][idx] - tmp[0][i][idx]);
+        // if b = O, then a + b = a
+        tmp[2][i][idx] <== tmp[1][i][idx] + bIsInfinity * (a[i][idx] - tmp[1][i][idx]);
+        out[i][idx] <== tmp[2][i][idx] + isInfinity * (a[i][idx] - tmp[2][i][idx]);
+   }
+
    component commitmentHash = Poseidon(2);
    (commitmentHash.inputs[0], commitmentHash.inputs[1]) <== (nullifier, secret);
 }
diff --git a/grammar/Circom.g4 b/grammar/Circom.g4
index efca039..109392f 100644
--- a/grammar/Circom.g4
+++ b/grammar/Circom.g4
@@ -116,7 +116,7 @@ primary
     ;
 
 logStmt
-    : 'log' '(' (STRING | expression)? ')'
+    : 'log' '(' ((STRING | expression) (',' (STRING | expression))*)? ')'
     ;
 
 componentDefinition: 'component' ID ;
@@ -156,7 +156,7 @@ blockInstantiation: 'parallel'? ID '(' expressionList? ')' componentCall? ;
 
 expressionList: expression (',' expression)* ;
 
-identifier: ID arrayDimension* ;
+identifier: (ID | (ID '.' ID)) arrayDimension* ;
 
 arrayDimension: '[' expression ']' ;
 

From d736012375293b3de08b5a32e3eaf35a50ba3be8 Mon Sep 17 00:00:00 2001
From: Kyryl Riabov <kyryl.ryabov@gmail.com>
Date: Thu, 10 Oct 2024 13:33:34 +0300
Subject: [PATCH 2/2] Added completed expression in log

---
 data/Example1.circom | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/Example1.circom b/data/Example1.circom
index b1e0f12..e96880d 100644
--- a/data/Example1.circom
+++ b/data/Example1.circom
@@ -59,6 +59,7 @@ template nbits(a) {
    outA <== i;
 
    log("Number: ", 100);
+   log("Complicated expression: ", 1 + g[d - functionCall2(1)] * 3 + functionCall(1, 2, 3));
 
    for(var i=0; i<2; i++)for(var idx=0; idx<CHUNK_NUMBER; idx++){
         tmp[0][i][idx] <== add.out[i][idx] + addIsDouble * (doub.out[i][idx] - add.out[i][idx]);