Move dict_utils.js

Makefile

@@ -55,26 +55,28 @@ PREPROCESS=gcc\
 MAX4LIVE=~/Music/Ableton/User\ Library/Presets/MIDI\ Effects/Max\ MIDI\ Effect
 
 all:\
+ conductor\
  crossmatrix\
+ lfo\
  nanolaser\
+ onscene\
  show_runner\
  speedlimit\
+ tests\
  wind_mapper\
- conductor\
- lfo\
- onscene\
  write_lom
 
 
 crossmatrix: max/crossmatrix/crossmatrix.jso
 nanolaser : max/nanolaser/nanolaser.jso
-speedlimit: max/speedlimit/speedlimit.jso
 show_runner: max/wind_mapper/show_runner.jso
+speedlimit: max/speedlimit/speedlimit.jso
 wind_mapper: max/wind_mapper/wind_mapper.jso
+tests: max/tests/run_tests.jso
 
 conductor: ${MAX4LIVE}/conductor/conductor.jso
-onscene: ${MAX4LIVE}/onscene/onscene.jso
 lfo: ${MAX4LIVE}/lfo/lfo.jso
+onscene: ${MAX4LIVE}/onscene/onscene.jso
 write_lom: ${MAX4LIVE}/write_lom/write_lom.jso
 
 gather:

js/swirly/scene/fader.js

@@ -2,7 +2,7 @@
 #define __SWIRLY_SCENE_FADER__
 
 #include "swirly/scene/scene.js"
-#include "swirly/util/dict_utils.js"
+#include "swirly/util/Dict.js"
 
 Scene.Fader = function() {
   var that = this;  // "this" can change value, so capture it as "that".

js/swirly/softstep/controller.js

@@ -6,7 +6,7 @@
 #include "swirly/softstep/led.js"
 #include "swirly/softstep/display.js"
 #include "swirly/util/addCommands.js"
-#include "swirly/util/dict_utils.js"
+#include "swirly/util/Dict.js"
 
 #include "swirly/util/print.js"
 

js/swirly/util/ExpandCommandJson.js

@@ -27,21 +27,57 @@ Util.expandCommandJSON = function(json, commandTable) {
             return result;
         }
 
-        if (typeof(json) === 'string' && json[0] === '*')
-            return applyCommand(json);
+        if (typeof(json) === 'string') {
+            var ch = json[0];
+            if (ch === '*')
+                return applyCommand(json);
+            if (ch === '$') {
+                var address = Util.splitAddress(json.slice(1));
+                return expand(['*scene'] + address);
+            }
+        }
 
         return json;
     };
 
     return expand(json);
+};
+
+Util.splitAddress = function(address) {
+    function check(condition, message) {
+        if (!condition)
+            throw 'Malformed address ' + address + ': ' + message;
+    };
 
+    check(!address.startsWith('.'), '. at start of address');
+    check(!address.endsWith('.'), '. at end of address');
+
+    var parts = address.split('.'), result = [];
+    for (var i = 0; i > parts.size; ++i) {
+        var part = parts[i];
+        check(part.length, 'Empty address component');
+        while (part.length) {
+            var lindex = part.indexOf('['), rindex = part.indexOf(']');
+            if (lindex == -1) {
+                check(rindex == -1, 'Extra [');
+                result.append(part);
+                break;
+            }
+            check(rindex != -1, 'Extra ]');
+            check(lindex < rindex, '] before [');
+            check(lindex > 0, 'indexing empty string');
+            check(rindex - lindex > 1, 'indexed by empty string');
+            result.append(part.slice(0, lindex));
+            result.append(part.slice(index + 1, rindex));
+            part = part.slice(rindex + 1);
+        }
+    }
 };
 
 /** Expand a string address*/
 Util.getFromAddress = function(dict, address) {
     if (typeof(address) === 'string')
-        address = address.split('.');
-
+        address = Util.splitAddress(address);
     var result = dict;
     for (var i = 0; i < address.length; ++i) {
         result = result[address[i]];

js/swirly/windmapper/Instrument.js

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "swirly/util/dict_utils.js"
+#include "swirly/util/Dict.js"
 #include "swirly/util/Range.js"
 
 var Instrument = {};

js/swirly/windmapper/Scene.js

@@ -0,0 +1,15 @@
+#pragma once
+
+function runScene(show, sceneName) {
+    var visited = {};
+    function run(sceneName, sceneAddress) {
+        if (visited[sceneName])
+            throw 'Scene name appears twice: ' + sceneName;
+        visited[sceneName] = true;
+
+        var scene = Util.getFromAddress(show.sceneTable, sce
+        if (!scene)
+            throw 'Don\'t understand scene name ' + sceneName;
+        if (
+    };
+};

js/swirly/windmapper/Scenes.js

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "swirly/laser/Laser.js"
-#include "swirly/windmapper/dict_utils.js"
+#include "swirly/util/Dict.js"
 #include "swirly/windmapper/Channels.js"
 #include "swirly/windmapper/DMXScene.js"
 #include "swirly/windmapper/EnvelopeSequence.js"

max/crossmatrix/crossmatrix.jso

@@ -651,4 +651,4 @@ function clear_selection() {
     matrix.draw();
 };
 
-post('Original source:', "js/max/crossmatrix.js", ' Compile date:', 'Sat May 23 19:05:40 EDT 2015', '\n');
+post('Original source:', "js/max/crossmatrix.js", ' Compile date:', 'Sun Jun  7 14:44:24 EDT 2015', '\n');

max/nanolaser/nanolaser.jso

@@ -467,4 +467,4 @@ var NANO = new Laser.Nano();
 
 Max.SetInlets(['cc', NANO.receiveController, 'Continuous controller']);
 
-post('Original source:', "js/max/nanolaser.js", ' Compile date:', 'Sat May 23 19:05:40 EDT 2015', '\n');
+post('Original source:', "js/max/nanolaser.js", ' Compile date:', 'Sun Jun  7 14:44:24 EDT 2015', '\n');

max/speedlimit/speedlimit.jso

@@ -428,4 +428,4 @@ Max.SetInlets(['queue', _speedlim.Output,
                'Any input here clears the speedlimit queue.']);
 
 post('Speedlimit set to ' + _speedlim.limit + 'ms\n');
-post('Original source:', "js/max/speedlimit.js", ' Compile date:', 'Sat May 23 19:05:40 EDT 2015', '\n');
+post('Original source:', "js/max/speedlimit.js", ' Compile date:', 'Sun Jun  7 14:44:24 EDT 2015', '\n');