fixed string quote parsing issue

ppaska · ppaska · commit 3fb2995232d4 · 2020-12-28T09:09:56.000Z
diff --git a/index.html b/index.html
@@ -28,7 +28,16 @@
 <body>
   <div class="container">
     <h4>JSPython development console</h4>
-    <div id="editor">x = -3.14 + 1</div>
+    <div id="editor">
+    def power(base, exponent):
+      if exponent == 0:
+        return 1
+      else:
+        return base * power(base, exponent - 1)
+    
+    "5 ** 10 = " + power(5, 10) + " == " + Math.pow(5, 10)
+          
+    </div>
     <!--
           def f(n):
             n * n
diff --git a/src/interpreter.spec.ts b/src/interpreter.spec.ts
@@ -364,4 +364,22 @@ describe('Interpreter', () => {
 
   });
 
+  it('Recursive function - power', async () => {
+  
+    const script = 
+    `
+    def power(base, exponent):
+      if exponent == 0:
+        return 1
+      else:
+        return base * power(base, exponent - 1)
+    
+    "5 ** 10 == " + power(5, 10) + " == " + Math.pow(5, 10)    
+    `
+    expect(await e.evaluate(script)).toBe('5 ** 10 == 9765625 == 9765625');   
+  });
+  
+
+
+
 });
diff --git a/src/tokenizer/tokenizer.ts b/src/tokenizer/tokenizer.ts
@@ -145,6 +145,9 @@ export class Tokenizer {
                         this.tokenText += script[this._cursor];
                         if (this._cursor + 1 >= script.length) break;
                     }
+
+                    //start column needs to take into account a begining quote, not just a string
+                    this._startColumn--;
                 }
 
                 // a special case when empty string

Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,9 @@ export class Tokenizer {`
`145`	`145`	`this.tokenText += script[this._cursor];`
`146`	`146`	`if (this._cursor + 1 >= script.length) break;`
`147`	`147`	`}`
	`148`	`+`
	`149`	`+ //start column needs to take into account a begining quote, not just a string`
	`150`	`+ this._startColumn--;`
`148`	`151`	`}`
`149`	`152`
`150`	`153`	`// a special case when empty string`