Implement assigment operators

batiste · Jan 20, 2020 · 5b6c043 · 5b6c043
1 parent 612ccdf
commit 5b6c043
Show file tree

Hide file tree

Showing 12 changed files with 520 additions and 63 deletions.
diff --git a/example/ComponentState/ComponentStatePage.blop b/example/ComponentState/ComponentStatePage.blop
@@ -80,7 +80,7 @@ Animation = (attributes, children, node) => {
   runAnimation = true
   i = attributes.initial || 0
   animate = () => {
-    i := i + 0.02
+    i += 0.02
     position.x = (w.innerWidth / 2) + 120 * Math.cos(i) - 60
     position.y = (w.innerHeight / 2) + 120 * Math.sin(i) - 60
     setPos(position)

diff --git a/example/DogPage/DogBreedGame.blop b/example/DogPage/DogBreedGame.blop
@@ -10,10 +10,10 @@ def DogGame(attributes, children) {
   def check() {
     guess = input.elm.value.toLowerCase().replace(' ', '-')
     input.elm.value = ''
-    page.attempt = page.attempt + 1
+    page.attempt += 1
     if (guess == dog.breed) {
       delete page.lastMistake
-      page.success = page.success + 1
+      page.success += 1
     } else {
       page.lastMistake = { breed: dog.breed, guess }
     }

diff --git a/example/PetStore/index.blop b/example/PetStore/index.blop
@@ -11,11 +11,11 @@ def pagination(petStore) {
   nbPage = Math.ceil(pets.length / pageSize)
   nextPage = (e) => {
     e.preventDefault()
-    petStore.pageIndex = pageIndex + 1
+    petStore.pageIndex += 1
   }
   previousPage = (e) => {
     e.preventDefault()
-    petStore.pageIndex = pageIndex - 1
+    petStore.pageIndex -= 1
   }
   <p class="pagination">
     if pageIndex > 0 {

diff --git a/src/backend.js b/src/backend.js
@@ -110,7 +110,7 @@ function _backend(node, _stream, _input, _filename = false, rootSource, resolve
         const redefinedBy = stream[node.stream_index];
         const sourceContext = utils.streamContext(input, token, token, stream);
         const redefineContext = utils.streamContext(input, redefinedBy, redefinedBy, stream);
-        const error = new Error(`Redefinition of ${name} from upper scope. Use explicit := or rename ${name}
+        const error = new Error(`Redefinition of ${name} within this scope. Use explicit := or rename ${name}
         ${sourceContext}
 
         Redefined by
@@ -342,6 +342,14 @@ function _backend(node, _stream, _input, _filename = false, rootSource, resolve
       output.push(';');
       return output;
     },
+    'assign_op': (node) => {
+      const output = [];
+      shouldBeDefined(node.named.name.value, node.named.name);
+      for (let i = 0; i < node.children.length; i++) {
+        output.push(...generateCode(node.children[i]));
+      }
+      return output;
+    },
     'exp_statement': (node) => {
       const output = [];
       for (let i = 0; i < node.children.length; i++) {

diff --git a/src/grammar.js b/src/grammar.js
@@ -24,6 +24,7 @@ const grammar = {
   'GLOBAL_STATEMENT': [
     ['condition'],
     ['assign'],
+    ['assign_op'],
     ['virtual_node'],
     ['class_def'],
     ['try_catch'],
@@ -39,6 +40,7 @@ const grammar = {
   'SCOPED_STATEMENT': [
     ['condition'],
     ['assign'],
+    ['assign_op'],
     ['virtual_node'],
     ['class_def'],
     ['try_catch'],
@@ -61,6 +63,10 @@ const grammar = {
     ['object_destructuring:destructuring', 'w', '=', 'w', 'exp:exp'],
     ['name:path', 'object_access:access', 'w', '=', 'w', 'exp:exp'],
   ],
+  'assign_op': [
+    ['name:name', 'annotation?:annotation', 'w', 'assign_operator', 'w', 'exp:exp'],
+    ['name:name', 'object_access:access', 'w', 'assign_operator', 'w', 'exp:exp'],
+  ],
   'for_loop': [
     ['for', 'name:value', 'w', 'in', 'exp:exp', 'annotation?:objectannotation', 'w', '{', 'SCOPED_STATEMENTS*:stats', '}'],
     ['for', 'name:key', 'annotation?:keyannotation', ',', 'w', 'name:value', 'w', 'in', 'exp:exp', 'annotation?:objectannotation', 'w', '{', 'SCOPED_STATEMENTS*:stats', '}'],