Make blocks code runnable

coolreader18 · coolreader18 · commit 0d7fb0ac6523 · 2019-04-19T16:12:16.000-05:00
diff --git a/src/codingworkshops/views/Project.vue b/src/codingworkshops/views/Project.vue
@@ -1,6 +1,6 @@
 <template lang="pug">
 .full.d-flex.flex-column.justify-content-between(v-if="!$rest.loading && $rest.project.ok")
-  Nico.p-5(:show-greeting="false" language="Python" editorMode="block" :script-boilerplate="false")
+  Nico.p-5(:show-greeting="false" language="Python" editorMode="blocks" :script-boilerplate="false")
   div.p-4.d-flex.justify-content-between.border-light.bt-only(style="height: 70px;")
     div
       router-link.mr-green(:to="{ name: 'home' }")
diff --git a/src/nico/src/nico/App.vue b/src/nico/src/nico/App.vue
@@ -4,7 +4,7 @@
 
   Game(v-if="showTabs.game" v-show="view === 'game'" :show-greeting="showGreeting")
   Editor(v-if="showTabs.editor && editorMode == 'code'" v-show="view === 'editor'" :language="language")
-  BlockEditor(v-if="showTabs.editor && editorMode == 'block'" v-show="view === 'editor'")
+  BlockEditor(v-if="showTabs.editor && editorMode == 'blocks'" v-show="view === 'editor'")
   Sprite(v-if="showTabs.sprite" v-show="view === 'sprite'")
   Tile(v-if="showTabs.tile" v-show="view === 'tile'")
   Settings(v-if="showTabs.settings" v-show="view === 'settings'")
@@ -68,11 +68,12 @@ export default {
     ...mapState('nico', ['view']),
   },
   mounted () {
-    this.setLanguage(this.language)
+    this.setEditorMode(this.editorMode)
+    if (this.editorMode === 'code') this.setLanguage(this.language)
     if (this.scriptBoilerplate) this.loadBoilerplate()
   },
   methods: {
-    ...mapMutations('nico', ['loadBoilerplate']),
+    ...mapMutations('nico', ['loadBoilerplate', 'setEditorMode']),
     ...mapActions('nico', ['setLanguage']),
   },
 }
diff --git a/src/nico/src/nico/components/BlockEditor.vue b/src/nico/src/nico/components/BlockEditor.vue
@@ -1,24 +1,26 @@
 <template lang="pug">
-  .d-flex
-    .flex-1.m-3
-      h6.font-weight-bold Control Flow
-      Block(:children="controlFlow" clone)
-      Expr(:exprs="vars" clone)
-      // mw-35 just for displaying blocksRoot
-    .flex-1.m-3.mw-35
-      h6.font-weight-bold Nico
-      Block(:children="nicoFuncs" clone)
-      | {{ blocksRoot }}
-      br
-      | {{ compiledBlocks }}
-    .flex-1.p-3.w-50
-      Block(:children="blocksRoot")
+  div
+    .d-flex
+      .flex-1.m-3
+        h6.font-weight-bold Control Flow
+        Block(:children="controlFlow" clone)
+        Expr(:exprs="vars" clone)
+        // mw-35 just for displaying blocksRoot
+      .flex-1.m-3.mw-35
+        h6.font-weight-bold Nico
+        Block(:children="nicoFuncs" clone)
+        | {{ blocksRoot }}
+        br
+        | {{ compiledBlocks }}
+      .flex-1.p-3.w-50
+        Block(:children="blocksRoot")
 </template>
 
 <script>
 import Block from './Block'
 import Expr from './Expr'
 import { compile } from '../compileBlocks'
+import { mapMutations } from 'vuex';
 
 const makeLit = value => ({
   type: 'literal',
@@ -62,6 +64,11 @@ export default {
           func: 'rect',
           params: [0, 0, 0, 0].map(makeLit),
         },
+        {
+          type: 'callMars',
+          func: 'text',
+          params: ['', 0, 0].map(makeLit),
+        }
       ],
       vars: [
         {
@@ -76,6 +83,17 @@ export default {
       return compile(this.blocksRoot)
     },
   },
+  methods: {
+    ...mapMutations('nico', ['setCode', 'setBlocks'])
+  },
+  watch: {
+    blocksRoot: {
+      handler () {
+        this.setBlocks(this.blocksRoot)
+      },
+      deep: true,
+    }
+  }
 }
 </script>
 
diff --git a/src/nico/src/nico/store.js b/src/nico/src/nico/store.js
@@ -2,19 +2,22 @@ import generateSet from '@/generateSet'
 import * as languages from './languages'
 
 import { initMars } from './mars'
+import { compile } from './compileBlocks'
 
 export default {
   namespaced: true,
 
   state: {
     code: window.localStorage.getItem('code') || '',
+    blocks: [],
     errors: [],
     warnings: [],
     view: window.localStorage.getItem('view') || 'game',
     paused: false,
     running: false,
     mainCtx: null,
     hasBeenRun: false,
+    editorMode: 'code',
     language: new languages.Python(),
     loading: false,
     langLoading: false,
@@ -44,6 +47,7 @@ export default {
       'mainCtx',
       'paused',
       'clicks',
+      'editorMode',
       'language',
       'langLoading',
       'mars',
@@ -68,6 +72,9 @@ export default {
       state.code = code
       window.localStorage.setItem('code', state.code)
     },
+    setBlocks (state, blocks) {
+      state.blocks = blocks
+    },
     setRunning (state, running) {
       state.running = running
       state.hasBeenRun = true
@@ -118,26 +125,39 @@ export default {
 
       // this timeout is necessary for vuex to register the change in `loading`
       setTimeout(() => {
-        language
-          .refresh(state.code, mars)
-          .then(({ success, draw, update, init, errors, warnings, blocked }) => {
-            commit('setLoading', false)
-            commit('setWarnings', warnings || [])
-            commit('setClicks', 0)
-
-            if (success) {
-              commit('setRunning', true)
-              commit('setPaused', false)
-
-              commit('setDrawFunc', draw)
-              commit('setUpdateFunc', update)
-
-              init()
-              startMars()
-            } else if (!blocked) {
-              commit('setErrors', errors)
-            }
-          })
+        if (state.editorMode === 'blocks') {
+          commit('setLoading', false)
+          commit('setWarnings', [])
+          commit('setClicks', 0)
+          commit('setRunning', true)
+          commit('setPaused', false)
+          const code = `(function(){${compile(state.blocks)}})`
+          const draw = eval(code)
+          commit('setDrawFunc', draw)
+          commit('setUpdateFunc', () => {})
+          startMars()
+        } else if (state.editorMode === 'code') {
+          language
+            .refresh(state.code, mars)
+            .then(({ success, draw, update, init, errors, warnings, blocked }) => {
+              commit('setLoading', false)
+              commit('setWarnings', warnings || [])
+              commit('setClicks', 0)
+
+              if (success) {
+                commit('setRunning', true)
+                commit('setPaused', false)
+
+                commit('setDrawFunc', draw)
+                commit('setUpdateFunc', update)
+
+                init()
+                startMars()
+              } else if (!blocked) {
+                commit('setErrors', errors)
+              }
+            })
+        }
         // delay helps make sure that the old game stops
       }, 100)
     },
