gobstones-code-runner 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 844e384b48de376e216b3a46967286478da86e79f8bba21b4f2d9ce2db97cab6
-  data.tar.gz: de9b26b6d68bac5f6c798278ed6ad6b31b9598dda967a321466fe16a2b758753
+  metadata.gz: e573e21d04542a3a3c641184dbde11da4cc41c68fa0bca64a4314936522c72b5
+  data.tar.gz: 0c76ec7c9017defb7b66268c5f483818576b9f0a8de829dd26adff4339558801
 SHA512:
-  metadata.gz: 66445365da20a2f998ca77e191e00d033bda8111f194a93b8e5776b495870c4f4b51935173548e5abec978992bea54fcc7cd6c278fe1089482998c504017e9d5
-  data.tar.gz: 227f1d8c17f9e766a31868371edfcc6f2b6b951fe3606e9154dd778532ca6cccb229e44b76762633f29667d49b5a8403cf0727216100496592daa4ae844073a2
+  metadata.gz: dd5c4dd52aed44d217c2a4187e34d8dfc822fd3e465078f5577f489f235a4e37a5e4a013567787a3fab62ced7ec93f2f41140da66db80dcd6a4d46d194b788e4
+  data.tar.gz: 35fca0ed6734d05c9d081932fe5c68a02722782f771622c279a4170e1f4e640624cad3b53d234eb81882e277cc4d465aa48ff378d3e344a793d5418e78686950

data/app/assets/htmls/gobstones-code-runner.html

@@ -4214,25 +4214,34 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
       try {
         var result = this.parser.interpret(ast.program, initialState);
         return {
-          states: this._getStates(result, ast.teacher),
+          states: this._getStates(result, ast),
           returnValue: result.returnValue,
           actualReturnValue: result.actualReturnValue
         };
       } catch (e) {
         e.location = this.parser.getErrorLineAndMode(e, code);
         return {
-          states: this._getStates(e, ast.teacher, { error: e })
+          states: this._getStates(e, ast, { error: e })
         };
       }
     }
 
-    _getStates(result, teacherAst, lastState = []) {
-      const teacherTools = this.__flatten(Object.values(
-        this.parser.getActionsFromAst(teacherAst)
+    _getActionsOf(ast) {
+      return this.__flatten(Object.values(
+        this.parser.getActionsFromAst(ast)
       )).map(it => it.name);
+    }
 
-      const snapshots = result.snapshots;
+    _getStates(result, ast, lastState = []) {
+      const studentAtomic = this._getActionsOf(ast.main).filter((it) =>
+        ast.main.getAttributes(it).atomic != null
+      );
+      const teacherAtomic = this._getActionsOf(ast.teacher).filter((it) =>
+        ast.main.getAttributes(it).nonatomic == null
+      );
+      const atomicActions = studentAtomic.concat(teacherAtomic);
 
+      const snapshots = result.snapshots;
       return snapshots
         .filter((snapshot, i) => {
           const toName = (it) => it.split("-")[0];
@@ -4241,10 +4250,10 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
           const lastName = snapshot.contextNames[snapshot.contextNames.length - 1];
 
           let topIgnoredName = prevNames.find((it) =>
-            teacherTools.includes(toName(it))
+            atomicActions.includes(toName(it))
           ) || lastName;
 
-          const hasToIgnoreIt = teacherTools.includes(toName(topIgnoredName));
+          const hasToIgnoreIt = atomicActions.includes(toName(topIgnoredName));
 
           const isTheLastOcurrence = snapshots.slice(i + 1).every(futureSnapshot =>
             !futureSnapshot.contextNames.includes(topIgnoredName)
@@ -20134,6 +20143,7 @@ function writeJboardToFile(filename, jboard) {
 
               this.runner.run({
                 ast: {
+                  main: ast,
                   program: ast.program,
                   teacher: teacherAst
                 },

data/lib/gobstones/code-runner/version.rb

@@ -1,5 +1,5 @@
 module Gobstones
   module CodeRunner
-    VERSION = "0.8.0"
+    VERSION = "0.9.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gobstones-code-runner
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Rodrigo Alfonso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-21 00:00:00.000000000 Z
+date: 2019-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler