mumuki-laboratory 6.7.2 → 6.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1245fecef79f70f30cef408fd0791c6533b8ca6275de62f87a4b80143eca8ea1
-  data.tar.gz: 5a582f5dcf4589376b68fab271f868be8bd462b8eba6ae816c5953468b70d2b4
+  metadata.gz: 1636741b645cb8e5066f55dc71ecae6397059a70cf98d63091e4b04d17d1f1c2
+  data.tar.gz: 4b94d32166df801a5eff64a4f6c3d4586a030086d9b49bfa6be99e62142b4fb0
 SHA512:
-  metadata.gz: 301fb226da9efb70e86e5387d2e73414fe9db74b294238a597f0ce84820894c28dd54733151836a16d25fc71f87bd53d112460f49e45123d26d152060a059e57
-  data.tar.gz: e0fc7c0dc9fa2634cf0364c87ccfc3d2ce647a5eec22ca33d31919f34d5240e8ec8037ab958d3072d771497fb1d88f3287cafa91cbae4ae0252694584aa2cf02
+  metadata.gz: 683108fa3fead68c272baa45afe07ac80baeaabe9c763f74beb41e19a3fbf662e7e3d0aa8f784ff40e1513227d684176b07088a525a3a2d2068b27317d5a2904
+  data.tar.gz: f38177eb7ba4f2509262c0cdc2e578579ffd691a99c3574964dfa03b21c39dcf98979f86318d8f9a84934774dd11361659290a72cec258e26cecc889b2093bee

data/app/assets/javascripts/mumuki_laboratory/application.js

@@ -23,6 +23,7 @@
 //= require jquery-console
 
 //= require codemirror.min
+//= require codemirror-simple-mode.js
 //= require codemirror-autorefresh
 //= require codemirror-modes
 //= require analytics

data/app/assets/javascripts/mumuki_laboratory/application/codemirror.js

@@ -71,8 +71,6 @@ var mumuki = mumuki || {};
 
 
   mumuki.load(function () {
-    CodeMirror.currentLocale = mumuki.locale;
-
     mumuki.page.editors = createCodeMirrors();
     updateCodeMirrorLanguage();
     onSelectUpdateCodeMirror();

data/app/helpers/open_graph_helper.rb

@@ -2,7 +2,7 @@ module OpenGraphHelper
   def open_graph_tags(subject)
     %Q{
       <meta property="og:site_name" content="#{Organization.current.site_name}" />
-      <meta property="og:title" content="#{page_title subject}"/>
+      <meta property="og:title" content="#{h page_title(subject)}"/>
       <meta property="og:description" content="#{Organization.current.central? ? t(:mumuki_short_description) : Organization.current.description}"/>
       <meta property="og:type" content="website"/>
       <meta property="og:image" content="#{Organization.current.open_graph_image_url}"/>

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '6.7.2'
+    VERSION = '6.7.3'
   end
 end

data/vendor/assets/javascripts/codemirror-modes/gobstones.js

@@ -1,1059 +1,71 @@
-// Parts from Ace; see <https://raw.githubusercontent.com/ajaxorg/ace/master/LICENSE>
-CodeMirror.defineMode("gobstones", function(cmCfg, modeCfg) {
-
-  // Fake define() function.
-  var moduleHolder = Object.create(null);
-
-  // Given a module path as a string, create the canonical version
-  // (no leading ./, no ending .js).
-  var canonicalPath = function(path) {
-    return path.replace(/\.\//, '').replace(/\.js$/, '');
+// https://codemirror.net/demo/simplemode.html
+
+(function() {
+  var locale = document.querySelector("html").lang || 'es';
+
+  var keywords = [
+    "program", "procedure", "function", "interactive", "if",
+    "then", "else", "switch", "repeat", "while",
+    "foreach", "in", "not", "div", "mod",
+    "Skip", "return"
+  ];
+
+  var atoms = {
+    es: ["Verde", "Rojo", "Azul", "Negro", "Norte", "Sur", "Este", "Oeste", "False", "True"],
+    pt: ["Verde", "Vermelho", "Azul", "Preto", "Norte", "Sul", "Leste", "Oeste", "False", "True"],
+    en: ["Green", "Red", "Blue", "Black", "North", "South", "East", "West", "False", "True"]
   };
 
-  // We intentionally add the `path` argument to `define()`.
-  var define = function(path, init) {
-    var exports = Object.create(null);
-    init(require, exports);  // module (3rd parameter) isn't supported.
-    moduleHolder[canonicalPath(path)] = exports;
+  var builtins = {
+    es: ["Poner", "Sacar", "Mover", "IrAlBorde", "VaciarTablero", "nroBolitas", "hayBolitas", "puedeMover", "siguiente", "previo", "opuesto", "minBool", "maxBool", "minDir", "maxDir", "minColor", "maxColor"],
+    pt: ["Colocar", "Retirar", "Mover", "IrAlBorda", "VaciarTablero", "nroPedras", "haPedras", "podeMover", "seguinte", "previo", "oposto", "minBool", "maxBool", "minDir", "maxDir", "minCor", "maxCor"],
+    en: ["Put", "Grab", "Move", "GoToEdge", "EmptyBoardContents", "numStones", "anyStones", "canMove", "next", "prev", "opposite", "minBool", "maxBool", "minDir", "maxDir", "minColor", "maxColor"]
   };
 
-  // path: string of the location of the JS file.
-  var require = function(path) { return moduleHolder[canonicalPath(path)]; };
-
-  // All dependencies here.
-  define("../lib/oop.js", function(require, exports, module) {
-    "use strict";
-
-    exports.inherits = function(ctor, superCtor) {
-        ctor.super_ = superCtor;
-        ctor.prototype = Object.create(superCtor.prototype, {
-            constructor: {
-                value: ctor,
-                enumerable: false,
-                writable: true,
-                configurable: true
-            }
-        });
-    };
-
-    exports.mixin = function(obj, mixin) {
-        for (var key in mixin) {
-            obj[key] = mixin[key];
-        }
-        return obj;
-    };
-
-    exports.implement = function(proto, mixin) {
-        exports.mixin(proto, mixin);
-    };
-
-    });
-
-
-  define("../lib/lang.js", function(require, exports, module) {
-    "use strict";
-
-    exports.last = function(a) {
-        return a[a.length - 1];
-    };
-
-    exports.stringReverse = function(string) {
-        return string.split("").reverse().join("");
-    };
-
-    exports.stringRepeat = function (string, count) {
-        var result = '';
-        while (count > 0) {
-            if (count & 1)
-                result += string;
-
-            if (count >>= 1)
-                string += string;
-        }
-        return result;
-    };
-
-    var trimBeginRegexp = /^\s\s*/;
-    var trimEndRegexp = /\s\s*$/;
-
-    exports.stringTrimLeft = function (string) {
-        return string.replace(trimBeginRegexp, '');
-    };
-
-    exports.stringTrimRight = function (string) {
-        return string.replace(trimEndRegexp, '');
-    };
-
-    exports.copyObject = function(obj) {
-        var copy = {};
-        for (var key in obj) {
-            copy[key] = obj[key];
-        }
-        return copy;
-    };
-
-    exports.copyArray = function(array){
-        var copy = [];
-        for (var i=0, l=array.length; i<l; i++) {
-            if (array[i] && typeof array[i] == "object")
-                copy[i] = this.copyObject(array[i]);
-            else
-                copy[i] = array[i];
-        }
-        return copy;
-    };
-
-    exports.deepCopy = function deepCopy(obj) {
-        if (typeof obj !== "object" || !obj)
-            return obj;
-        var copy;
-        if (Array.isArray(obj)) {
-            copy = [];
-            for (var key = 0; key < obj.length; key++) {
-                copy[key] = deepCopy(obj[key]);
-            }
-            return copy;
-        }
-        if (Object.prototype.toString.call(obj) !== "[object Object]")
-            return obj;
-
-        copy = {};
-        for (var key in obj)
-            copy[key] = deepCopy(obj[key]);
-        return copy;
-    };
-
-    exports.arrayToMap = function(arr) {
-        var map = {};
-        for (var i=0; i<arr.length; i++) {
-            map[arr[i]] = 1;
-        }
-        return map;
-
-    };
-
-    exports.createMap = function(props) {
-        var map = Object.create(null);
-        for (var i in props) {
-            map[i] = props[i];
-        }
-        return map;
-    };
-
-    /*
-     * splice out of 'array' anything that === 'value'
-     */
-    exports.arrayRemove = function(array, value) {
-      for (var i = 0; i <= array.length; i++) {
-        if (value === array[i]) {
-          array.splice(i, 1);
-        }
-      }
-    };
-
-    exports.escapeRegExp = function(str) {
-        return str.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1');
-    };
-
-    exports.escapeHTML = function(str) {
-        return str.replace(/&/g, "&#38;").replace(/"/g, "&#34;").replace(/'/g, "&#39;").replace(/</g, "&#60;");
-    };
-
-    exports.getMatchOffsets = function(string, regExp) {
-        var matches = [];
-
-        string.replace(regExp, function(str) {
-            matches.push({
-                offset: arguments[arguments.length-2],
-                length: str.length
-            });
-        });
-
-        return matches;
-    };
-
-    /* deprecated */
-    exports.deferredCall = function(fcn) {
-        var timer = null;
-        var callback = function() {
-            timer = null;
-            fcn();
-        };
-
-        var deferred = function(timeout) {
-            deferred.cancel();
-            timer = setTimeout(callback, timeout || 0);
-            return deferred;
-        };
-
-        deferred.schedule = deferred;
-
-        deferred.call = function() {
-            this.cancel();
-            fcn();
-            return deferred;
-        };
-
-        deferred.cancel = function() {
-            clearTimeout(timer);
-            timer = null;
-            return deferred;
-        };
-
-        deferred.isPending = function() {
-            return timer;
-        };
-
-        return deferred;
-    };
-
-
-    exports.delayedCall = function(fcn, defaultTimeout) {
-        var timer = null;
-        var callback = function() {
-            timer = null;
-            fcn();
-        };
-
-        var _self = function(timeout) {
-            if (timer == null)
-                timer = setTimeout(callback, timeout || defaultTimeout);
-        };
-
-        _self.delay = function(timeout) {
-            timer && clearTimeout(timer);
-            timer = setTimeout(callback, timeout || defaultTimeout);
-        };
-        _self.schedule = _self;
-
-        _self.call = function() {
-            this.cancel();
-            fcn();
-        };
-
-        _self.cancel = function() {
-            timer && clearTimeout(timer);
-            timer = null;
-        };
-
-        _self.isPending = function() {
-            return timer;
-        };
-
-        return _self;
-    };
-    });
-
-
-  define("./text_highlight_rules.js", function(require, exports, module) {
-    "use strict";
-
-    var lang = require("../lib/lang");
-
-    var TextHighlightRules = function() {
-
-        // regexp must not have capturing parentheses
-        // regexps are ordered -> the first match is used
-
-        this.$rules = {
-            "start" : [{
-                token : "empty_line",
-                regex : '^$'
-            }, {
-                defaultToken : "text"
-            }]
-        };
-    };
-
-    (function() {
-
-        this.addRules = function(rules, prefix) {
-            if (!prefix) {
-                for (var key in rules)
-                    this.$rules[key] = rules[key];
-                return;
-            }
-            for (var key in rules) {
-                var state = rules[key];
-                for (var i = 0; i < state.length; i++) {
-                    var rule = state[i];
-                    if (rule.next || rule.onMatch) {
-                        if (typeof rule.next == "string") {
-                            if (rule.next.indexOf(prefix) !== 0)
-                                rule.next = prefix + rule.next;
-                        }
-                        if (rule.nextState && rule.nextState.indexOf(prefix) !== 0)
-                            rule.nextState = prefix + rule.nextState;
-                    }
-                }
-                this.$rules[prefix + key] = state;
-            }
-        };
-
-        this.getRules = function() {
-            return this.$rules;
-        };
-
-        this.embedRules = function (HighlightRules, prefix, escapeRules, states, append) {
-            var embedRules = typeof HighlightRules == "function"
-                ? new HighlightRules().getRules()
-                : HighlightRules;
-            if (states) {
-                for (var i = 0; i < states.length; i++)
-                    states[i] = prefix + states[i];
-            } else {
-                states = [];
-                for (var key in embedRules)
-                    states.push(prefix + key);
-            }
-
-            this.addRules(embedRules, prefix);
-
-            if (escapeRules) {
-                var addRules = Array.prototype[append ? "push" : "unshift"];
-                for (var i = 0; i < states.length; i++)
-                    addRules.apply(this.$rules[states[i]], lang.deepCopy(escapeRules));
-            }
-
-            if (!this.$embeds)
-                this.$embeds = [];
-            this.$embeds.push(prefix);
-        };
-
-        this.getEmbeds = function() {
-            return this.$embeds;
-        };
-
-        var pushState = function(currentState, stack) {
-            if (currentState != "start" || stack.length)
-                stack.unshift(this.nextState, currentState);
-            return this.nextState;
-        };
-        var popState = function(currentState, stack) {
-            // if (stack[0] === currentState)
-            stack.shift();
-            return stack.shift() || "start";
-        };
-
-        this.normalizeRules = function() {
-            var id = 0;
-            var rules = this.$rules;
-            function processState(key) {
-                var state = rules[key];
-                state.processed = true;
-                for (var i = 0; i < state.length; i++) {
-                    var rule = state[i];
-                    var toInsert = null;
-                    if (Array.isArray(rule)) {
-                        toInsert = rule;
-                        rule = {};
-                    }
-                    if (!rule.regex && rule.start) {
-                        rule.regex = rule.start;
-                        if (!rule.next)
-                            rule.next = [];
-                        rule.next.push({
-                            defaultToken: rule.token
-                        }, {
-                            token: rule.token + ".end",
-                            regex: rule.end || rule.start,
-                            next: "pop"
-                        });
-                        rule.token = rule.token + ".start";
-                        rule.push = true;
-                    }
-                    var next = rule.next || rule.push;
-                    if (next && Array.isArray(next)) {
-                        var stateName = rule.stateName;
-                        if (!stateName)  {
-                            stateName = rule.token;
-                            if (typeof stateName != "string")
-                                stateName = stateName[0] || "";
-                            if (rules[stateName])
-                                stateName += id++;
-                        }
-                        rules[stateName] = next;
-                        rule.next = stateName;
-                        processState(stateName);
-                    } else if (next == "pop") {
-                        rule.next = popState;
-                    }
-
-                    if (rule.push) {
-                        rule.nextState = rule.next || rule.push;
-                        rule.next = pushState;
-                        delete rule.push;
-                    }
-
-                    if (rule.rules) {
-                        for (var r in rule.rules) {
-                            if (rules[r]) {
-                                if (rules[r].push)
-                                    rules[r].push.apply(rules[r], rule.rules[r]);
-                            } else {
-                                rules[r] = rule.rules[r];
-                            }
-                        }
-                    }
-                    var includeName = typeof rule == "string" ? rule : rule.include;
-                    if (includeName) {
-                        if (Array.isArray(includeName))
-                            toInsert = includeName.map(function(x) { return rules[x]; });
-                        else
-                            toInsert = rules[includeName];
-                    }
-
-                    if (toInsert) {
-                        var args = [i, 1].concat(toInsert);
-                        if (rule.noEscape)
-                            args = args.filter(function(x) {return !x.next;});
-                        state.splice.apply(state, args);
-                        // skip included rules since they are already processed
-                        //i += args.length - 3;
-                        i--;
-                    }
-
-                    if (rule.keywordMap) {
-                        rule.token = this.createKeywordMapper(
-                            rule.keywordMap, rule.defaultToken || "text", rule.caseInsensitive
-                        );
-                        delete rule.defaultToken;
-                    }
-                }
-            }
-            Object.keys(rules).forEach(processState, this);
-        };
-
-        this.createKeywordMapper = function(map, defaultToken, ignoreCase, splitChar) {
-            var keywords = Object.create(null);
-            Object.keys(map).forEach(function(className) {
-                var a = map[className];
-                if (ignoreCase)
-                    a = a.toLowerCase();
-                var list = a.split(splitChar || "|");
-                for (var i = list.length; i--; )
-                    keywords[list[i]] = className;
-            });
-            // in old versions of opera keywords["__proto__"] sets prototype
-            // even on objects with __proto__=null
-            if (Object.getPrototypeOf(keywords)) {
-                keywords.__proto__ = null;
-            }
-            this.$keywordList = Object.keys(keywords);
-            map = null;
-            return ignoreCase
-                ? function(value) {return keywords[value.toLowerCase()] || defaultToken; }
-                : function(value) {return keywords[value] || defaultToken; };
-        };
-
-        this.getKeywords = function() {
-            return this.$keywords;
-        };
-
-    }).call(TextHighlightRules.prototype);
-
-    exports.TextHighlightRules = TextHighlightRules;
-    });
-
-
-  define("./doc_comment_highlight_rules.js", function(require, exports, module) {
-    "use strict";
-
-    var oop = require("../lib/oop");
-    var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-    var DocCommentHighlightRules = function() {
-        this.$rules = {
-            "start" : [ {
-                token : "comment.doc.tag",
-                regex : "@[\\w\\d_]+" // TODO: fix email addresses
-            },
-            DocCommentHighlightRules.getTagRule(),
-            {
-                defaultToken : "comment.doc",
-                caseInsensitive: true
-            }]
-        };
-    };
-
-    oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-    DocCommentHighlightRules.getTagRule = function(start) {
-        return {
-            token : "comment.doc.tag.storage.type",
-            regex : "\\b(?:TODO|FIXME|XXX|HACK)\\b"
-        };
-    };
-
-    DocCommentHighlightRules.getStartRule = function(start) {
-        return {
-            token : "comment.doc", // doc comment
-            regex : "\\/\\*(?=\\*)",
-            next  : start
-        };
-    };
-
-    DocCommentHighlightRules.getEndRule = function (start) {
-        return {
-            token : "comment.doc", // closing comment
-            regex : "\\*\\/",
-            next  : start
-        };
-    };
-
-
-    exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-    });
-
+  const localizedKeywordsAndBuiltins = keywords.concat(builtins[locale]);
+  const localizedAtoms = atoms[locale];
 
-  define("gobstones_highlight_rules", function(require, exports, module) {
-    "use strict";
-
-    var oop = require("../lib/oop");
-    var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-    var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-    var GobstonesHighlightRules = function() {
-
-        var buildList = function(values) {
-            return values.join('|');
-        };
-
-        var keywords = (
-            "program|procedure|function|interactive|if|then|else|switch|repeat|while|foreach|in|not|div|mod|Skip|return"
-        );
-
-        var allBuiltinConstants = {
-            es: ["Verde", "Rojo", "Azul", "Negro", "Norte", "Sur", "Este", "Oeste", "False", "True"],
-            pt: ["Verde", "Vermelho", "Azul", "Preto", "Norte", "Sul", "Leste", "Oeste", "False", "True"],
-            en: ["Green", "Red", "Blue", "Black", "North", "South", "East", "West", "False", "True"]
-        };
-
-        var allLangClasses = {
-            es: ["Poner", "Sacar", "Mover", "IrAlBorde", "VaciarTablero", "nroBolitas", "hayBolitas", "puedeMover", "siguiente", "previo", "opuesto", "minBool", "maxBool", "minDir", "maxDir", "minColor", "maxColor"],
-            pt: ["Colocar", "Retirar", "Mover", "IrAlBorda", "VaciarTablero", "nroPedras", "haPedras", "podeMover", "seguinte", "previo", "oposto", "minBool", "maxBool", "minDir", "maxDir", "minCor", "maxCor"],
-            en: ["Put", "Grab", "Move", "GoToEdge", "EmptyBoardContents", "numStones", "anyStones", "canMove", "next", "prev", "opposite", "minBool", "maxBool", "minDir", "maxDir", "minColor", "maxColor"]
-        };
-
-        var locale = CodeMirror.currentLocale || 'es';
-
-        registerAutocomplete('gobstones',
-            keywords.split('|')
-              .concat(allBuiltinConstants[locale])
-              .concat(allLangClasses[locale])
-        );
-
-        var keywordMapper = this.createKeywordMapper({
-            "keyword": keywords,
-            "constant.language": buildList(allBuiltinConstants[locale]),
-            "support.function": buildList(allLangClasses[locale]),
-            "support.type": ''
-        }, "identifier");
-
-        // regexp must not have capturing parentheses. Use (?:) instead.
-        // regexps are ordered -> the first match is used
-
-        this.$rules = {
-            "start" : [
-                {
-                    token : "comment",
-                    regex : "\\/\\/.*$"
-                },
-                {
-                    token : "comment",
-                    regex : "\\-\\-.*$"
-                },
-                {
-                    token : "comment",
-                    regex : "#.*$"
-                },
-                DocCommentHighlightRules.getStartRule("doc-start"),
-                {
-                    token : "comment", // multi line comment
-                    regex : "\\/\\*",
-                    next : "comment"
-                }, {
-
-                    token : "string", // single line
-                    regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-                }, {
-                    token : "string", // single line
-                    regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-                }, {
-                    token : "constant.numeric", // hex
-                    regex : /0(?:[xX][0-9a-fA-F][0-9a-fA-F_]*|[bB][01][01_]*)[LlSsDdFfYy]?\b/
-                }, {
-                    token : "constant.numeric", // float
-                    regex : /[+-]?\d[\d_]*(?:(?:\.[\d_]*)?(?:[eE][+-]?[\d_]+)?)?[LlSsDdFfYy]?\b/
-                }, {
-                    token : "constant.language.boolean",
-                    regex : "(?:True|False)\\b"
-                }, {
-                    token : "keyword.operator",
-                    regex : ":=|\\.\\.|,|;|\\|\\||\\/\\/|\\+|\\-|\\^|\\*|>|<|>=|=>|==|&&"
-                }, {
-                    token : keywordMapper,
-                    // TODO: Unicode escape sequences
-                    // TODO: Unicode identifiers
-                    regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-                }, {
-                    token : "lparen",
-                    regex : "[[({]"
-                }, {
-                    token : "rparen",
-                    regex : "[\\])}]"
-                }, {
-                    token : "text",
-                    regex : "\\s+"
-                }
-            ],
-            "comment" : [
-                {
-                    token : "comment", // closing comment
-                    regex : "\\*\\/",
-                    next : "start"
-                }, {
-                    defaultToken : "comment"
-                }
-            ]
-        };
-
-        this.embedRules(DocCommentHighlightRules, "doc-",
-            [ DocCommentHighlightRules.getEndRule("start") ]);
-    };
-
-    oop.inherits(GobstonesHighlightRules, TextHighlightRules);
-
-    exports.GobstonesHighlightRules = GobstonesHighlightRules;
-    });
-
-
-
-  // Ace highlight rules function imported below.
-  var HighlightRules = require("gobstones_highlight_rules").GobstonesHighlightRules;
-
-
-
-  // Ace's Syntax Tokenizer.
-
-  // tokenizing lines longer than this makes editor very slow
-  var MAX_TOKEN_COUNT = 1000;
-  var Tokenizer = function(rules) {
-      this.states = rules;
-
-      this.regExps = {};
-      this.matchMappings = {};
-      for (var key in this.states) {
-          var state = this.states[key];
-          var ruleRegExps = [];
-          var matchTotal = 0;
-          var mapping = this.matchMappings[key] = {defaultToken: "text"};
-          var flag = "g";
-
-          var splitterRurles = [];
-          for (var i = 0; i < state.length; i++) {
-              var rule = state[i];
-              if (rule.defaultToken)
-                  mapping.defaultToken = rule.defaultToken;
-              if (rule.caseInsensitive)
-                  flag = "gi";
-              if (rule.regex == null)
-                  continue;
-
-              if (rule.regex instanceof RegExp)
-                  rule.regex = rule.regex.toString().slice(1, -1);
-
-              // Count number of matching groups. 2 extra groups from the full match
-              // And the catch-all on the end (used to force a match);
-              var adjustedregex = rule.regex;
-              var matchcount = new RegExp("(?:(" + adjustedregex + ")|(.))").exec("a").length - 2;
-              if (Array.isArray(rule.token)) {
-                  if (rule.token.length == 1 || matchcount == 1) {
-                      rule.token = rule.token[0];
-                  } else if (matchcount - 1 != rule.token.length) {
-                      throw new Error("number of classes and regexp groups in '" +
-                          rule.token + "'\n'" + rule.regex +  "' doesn't match\n"
-                          + (matchcount - 1) + "!=" + rule.token.length);
-                  } else {
-                      rule.tokenArray = rule.token;
-                      rule.token = null;
-                      rule.onMatch = this.$arrayTokens;
-                  }
-              } else if (typeof rule.token == "function" && !rule.onMatch) {
-                  if (matchcount > 1)
-                      rule.onMatch = this.$applyToken;
-                  else
-                      rule.onMatch = rule.token;
-              }
-
-              if (matchcount > 1) {
-                  if (/\\\d/.test(rule.regex)) {
-                      // Replace any backreferences and offset appropriately.
-                      adjustedregex = rule.regex.replace(/\\([0-9]+)/g, function(match, digit) {
-                          return "\\" + (parseInt(digit, 10) + matchTotal + 1);
-                      });
-                  } else {
-                      matchcount = 1;
-                      adjustedregex = this.removeCapturingGroups(rule.regex);
-                  }
-                  if (!rule.splitRegex && typeof rule.token != "string")
-                      splitterRurles.push(rule); // flag will be known only at the very end
-              }
-
-              mapping[matchTotal] = i;
-              matchTotal += matchcount;
-
-              ruleRegExps.push(adjustedregex);
-
-              // makes property access faster
-              if (!rule.onMatch)
-                  rule.onMatch = null;
-          }
-
-          splitterRurles.forEach(function(rule) {
-              rule.splitRegex = this.createSplitterRegexp(rule.regex, flag);
-          }, this);
-
-          this.regExps[key] = new RegExp("(" + ruleRegExps.join(")|(") + ")|($)", flag);
-      }
+  var buildList = function(values) {
+    return values.join('|');
   };
 
-  (function() {
-      this.$setMaxTokenCount = function(m) {
-          MAX_TOKEN_COUNT = m | 0;
-      };
-
-      this.$applyToken = function(str) {
-          var values = this.splitRegex.exec(str).slice(1);
-          var types = this.token.apply(this, values);
-
-          // required for compatibility with old modes
-          if (typeof types === "string")
-              return [{type: types, value: str}];
-
-          var tokens = [];
-          for (var i = 0, l = types.length; i < l; i++) {
-              if (values[i])
-                  tokens[tokens.length] = {
-                      type: types[i],
-                      value: values[i]
-                  };
-          }
-          return tokens;
-      },
-
-      this.$arrayTokens = function(str) {
-          if (!str)
-              return [];
-          var values = this.splitRegex.exec(str);
-          if (!values)
-              return "text";
-          var tokens = [];
-          var types = this.tokenArray;
-          for (var i = 0, l = types.length; i < l; i++) {
-              if (values[i + 1])
-                  tokens[tokens.length] = {
-                      type: types[i],
-                      value: values[i + 1]
-                  };
-          }
-          return tokens;
-      };
-
-      this.removeCapturingGroups = function(src) {
-          var r = src.replace(
-              /\[(?:\\.|[^\]])*?\]|\\.|\(\?[:=!]|(\()/g,
-              function(x, y) {return y ? "(?:" : x;}
-          );
-          return r;
-      };
-
-      this.createSplitterRegexp = function(src, flag) {
-          if (src.indexOf("(?=") != -1) {
-              var stack = 0;
-              var inChClass = false;
-              var lastCapture = {};
-              src.replace(/(\\.)|(\((?:\?[=!])?)|(\))|([\[\]])/g, function(
-                  m, esc, parenOpen, parenClose, square, index
-              ) {
-                  if (inChClass) {
-                      inChClass = square != "]";
-                  } else if (square) {
-                      inChClass = true;
-                  } else if (parenClose) {
-                      if (stack == lastCapture.stack) {
-                          lastCapture.end = index+1;
-                          lastCapture.stack = -1;
-                      }
-                      stack--;
-                  } else if (parenOpen) {
-                      stack++;
-                      if (parenOpen.length != 1) {
-                          lastCapture.stack = stack
-                          lastCapture.start = index;
-                      }
-                  }
-                  return m;
-              });
-
-              if (lastCapture.end != null && /^\)*$/.test(src.substr(lastCapture.end)))
-                  src = src.substring(0, lastCapture.start) + src.substr(lastCapture.end);
-          }
-          return new RegExp(src, (flag||"").replace("g", ""));
-      };
-
-      /**
-      * Returns an object containing two properties: `tokens`, which contains all the tokens; and `state`, the current state.
-      * @returns {Object}
-      **/
-      this.getLineTokens = function(line, startState) {
-          if (startState && typeof startState != "string") {
-              var stack = startState.slice(0);
-              startState = stack[0];
-          } else
-              var stack = [];
-
-          var currentState = startState || "start";
-          var state = this.states[currentState];
-          if (!state) {
-              currentState = "start";
-              state = this.states[currentState];
-          }
-          var mapping = this.matchMappings[currentState];
-          var re = this.regExps[currentState];
-          re.lastIndex = 0;
-
-          var match, tokens = [];
-          var lastIndex = 0;
-
-          var token = {type: null, value: ""};
-
-          while (match = re.exec(line)) {
-              var type = mapping.defaultToken;
-              var rule = null;
-              var value = match[0];
-              var index = re.lastIndex;
-
-              if (index - value.length > lastIndex) {
-                  var skipped = line.substring(lastIndex, index - value.length);
-                  if (token.type == type) {
-                      token.value += skipped;
-                  } else {
-                      if (token.type)
-                          tokens.push(token);
-                      token = {type: type, value: skipped};
-                  }
-              }
-
-              for (var i = 0; i < match.length-2; i++) {
-                  if (match[i + 1] === undefined)
-                      continue;
-
-                  rule = state[mapping[i]];
-
-                  if (rule.onMatch)
-                      type = rule.onMatch(value, currentState, stack);
-                  else
-                      type = rule.token;
-
-                  if (rule.next) {
-                      if (typeof rule.next == "string")
-                          currentState = rule.next;
-                      else
-                          currentState = rule.next(currentState, stack);
-
-                      state = this.states[currentState];
-                      if (!state) {
-                          window.console && console.error && console.error(currentState, "doesn't exist");
-                          currentState = "start";
-                          state = this.states[currentState];
-                      }
-                      mapping = this.matchMappings[currentState];
-                      lastIndex = index;
-                      re = this.regExps[currentState];
-                      re.lastIndex = index;
-                  }
-                  break;
-              }
-
-              if (value) {
-                  if (typeof type == "string") {
-                      if ((!rule || rule.merge !== false) && token.type === type) {
-                          token.value += value;
-                      } else {
-                          if (token.type)
-                              tokens.push(token);
-                          token = {type: type, value: value};
-                      }
-                  } else if (type) {
-                      if (token.type)
-                          tokens.push(token);
-                      token = {type: null, value: ""};
-                      for (var i = 0; i < type.length; i++)
-                          tokens.push(type[i]);
-                  }
-              }
-
-              if (lastIndex == line.length)
-                  break;
-
-              lastIndex = index;
-
-              if (tokens.length > MAX_TOKEN_COUNT) {
-                  // chrome doens't show contents of text nodes with very long text
-                  while (lastIndex < line.length) {
-                      if (token.type)
-                          tokens.push(token);
-                      token = {
-                          value: line.substring(lastIndex, lastIndex += 2000),
-                          type: "overflow"
-                      };
-                  }
-                  currentState = "start";
-                  stack = [];
-                  break;
-              }
-          }
-
-          if (token.type)
-              tokens.push(token);
-
-          if (stack.length > 1) {
-              if (stack[0] !== currentState)
-                  stack.unshift(currentState);
-          }
-          return {
-              tokens : tokens,
-              state : stack.length ? stack : currentState
-          };
-      };
-
-  }).call(Tokenizer.prototype);
-
-  // Token conversion.
-  // See <https://github.com/ajaxorg/ace/wiki/Creating-or-Extending-an-Edit-Mode#common-tokens>
-  // This is not an exact match nor the best match that can be made.
-  var tokenFromAceToken = {
-    empty: null,
-    text: null,
-
-    // Keyword
-    keyword: 'keyword',
-      control: 'keyword',
-      operator: 'operator',
-
-    // Constants
-    constant: 'atom',
-      numeric: 'number',
-      character: 'atom',
-        escape: 'atom',
-
-    // Variables
-    variable: 'variable',
-    parameter: 'variable-3',
-    language: 'variable-2',  // Python's `self` uses that.
-
-    // Comments
-    comment: 'comment',
-      line: 'comment',
-        'double-slash': 'comment',
-        'double-dash': 'comment',
-        'number-sign': 'comment',
-        percentage: 'comment',
-      block: 'comment',
-        documentation: 'comment',
-
-    // String
-    string: 'string',
-      quoted: 'string',
-        single: 'string',
-        double: 'string',
-        triple: 'string',
-      unquoted: 'string',
-      interpolated: 'string',
-      regexp: 'string-2',
-
-    meta: 'meta',
-    literal: 'qualifier',
-    support: 'builtin',
-
-    // Markup
-    markup: 'tag',
-    underline: 'link',
-    link: 'link',
-    bold: 'strong',
-    heading: 'header',
-    italic: 'em',
-    list: 'variable-2',
-    numbered: 'variable-2',
-    unnumbered: 'variable-2',
-    quote: 'quote',
-    raw: 'variable-2',  // Markdown's raw block uses that.
-
-    // Invalid
-    invalid: 'error',
-    illegal: 'invalidchar',
-    deprecated: 'error'
-  };
-
-  // Takes a list of Ace tokens, returns a (string) CodeMirror token.
-  var cmTokenFromAceTokens = function(tokens) {
-    var token = null;
-    for (var i = 0; i < tokens.length; i++) {
-      // Find the most specific token.
-      if (tokenFromAceToken[tokens[i]] !== undefined) {
-        token = tokenFromAceToken[tokens[i]];
-      }
+  CodeMirror.defineSimpleMode("gobstones", {
+    // The start state contains the rules that are intially used
+    start: [
+      // The regex matches the token, the token property contains the type
+      {regex: /"(?:[^\\]|\\.)*?(?:"|$)/, token: "string"},
+      // You can match multiple tokens at once. Note that the captured
+      // groups must span the whole string in this case
+      {regex: /(function|procedure)(\s+)([a-zA-Z$][\w$]*)/, token: ["keyword", null, "variable-2"]},
+      // Rules are matched in the order in which they appear, so there is
+      // no ambiguity between this one and the one above
+      {regex: new RegExp(`(?:${buildList(localizedKeywordsAndBuiltins)})\\b`), token: "keyword"},
+      {regex: new RegExp(buildList(localizedAtoms)), token: "atom"},
+      {regex: /[-+]?(\d+)/i, token: "number"},
+      {regex: /\/\/.*/, token: "comment"},
+      {regex: /\/(?:[^\\]|\\.)*?\//, token: "variable-3"},
+      // A next property will cause the mode to move to a different state
+      {regex: /\/\*/, token: "comment", next: "comment"},
+      {regex: /(-|\+|\/|\*|\^|\|\||&&|:=|==|>=|<=|!=|<|>|!|div|mod)/, token: "operator"},
+      // indent and dedent properties guide autoindentation
+      {regex: /[\{\[\(]/, indent: true},
+      {regex: /[\}\]\)]/, dedent: true},
+      {regex: /[a-z]\w*/, token: "variable"}
+    ],
+    // The multi-line comment state.
+    comment: [
+      {regex: /.*?\*\//, token: "comment", next: "start"},
+      {regex: /.*/, token: "comment"}
+    ],
+    // The meta property contains global information about the mode. It
+    // can contain properties like lineComment, which are supported by
+    // all modes, and also directives like dontIndentStates, which are
+    // specific to simple modes.
+    meta: {
+      dontIndentStates: ["comment"],
+      lineComment: "//"
     }
-    return token;
-  };
-
-  // Consume a token from plannedTokens.
-  var consumeToken = function(stream, state) {
-    var plannedToken = state.plannedTokens.shift();
-    if (plannedToken === undefined) {
-      return null;
-    }
-    stream.match(plannedToken.value);
-    var tokens = plannedToken.type.split('.');
-    return cmTokenFromAceTokens(tokens);
-  };
-
-  var matchToken = function(stream, state) {
-    // Anormal start: we already have planned tokens to consume.
-    if (state.plannedTokens.length > 0) {
-      return consumeToken(stream, state);
-    }
-
-    // Normal start.
-    var currentState = state.current;
-    var currentLine = stream.match(/.*$/, false)[0];
-    var tokenized = tokenizer.getLineTokens(currentLine, currentState);
-    // We got a {tokens, state} object.
-    // Each token is a {value, type} object.
-    state.plannedTokens = tokenized.tokens;
-    state.current = tokenized.state;
-
-    // Consume a token.
-    return consumeToken(stream, state);
-  }
-
-  // Initialize all state.
-  var aceHighlightRules = new HighlightRules();
-  var tokenizer = new Tokenizer(aceHighlightRules.$rules);
-
-  return {
-    startState: function() {
-      return {
-        current: 'start',
-        // List of {value, type}, with type being an Ace token string.
-        plannedTokens: []
-      };
-    },
-    blankLine: function(state) { matchToken('', state); },
-    token: matchToken
-  };
-});
+  });
 
-CodeMirror.defineMIME("text/x-gobstones", "gobstones");
+  CodeMirror.defineMIME("text/x-gobstones", "gobstones");
+})();