gobstones-code-runner 0.5.4 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a290d6bed637f71612bbc05a6589da4eaab2a7fb6143b32588c84098cf30da4
-  data.tar.gz: 04e9c9e906cae088671fb7fd068ee298ee12c13ed484ba533140818b916f0a01
+  metadata.gz: dd4d6e14b4c9d319c5aac21edc4bbdc650ef33c7a3cc8e21d84e9289fb76945b
+  data.tar.gz: 2b0b1dbae7ea6ff8e1d072c2d7d3604f555fe728f3b26e9e0dfe6bebef6f8711
 SHA512:
-  metadata.gz: a7ca3879de314f968567c3a1c2c8cf0de9e7b9c4af772f7a3137e2f79362689aa76b6fc2e339b4818388413eeda227e37519e377cfeaeca1a3239c35d8f09ba4
-  data.tar.gz: d9d12116a96a6dc2d273f475b163a6401861ac45c458d74af23adfb79568523203a6e920bbebd03ae7e3ceb6ae7bc618c62d42c70db6e3146d710048ce3967e9
+  metadata.gz: d88527faa85751e22ec962217ffd9ac4ed314df55d4053532ee1ce619bd24a5f242896a9925d264fb61cf3c78cf489bf0810f8184026f4f0d3f31d5121822258
+  data.tar.gz: de88f8d3e46319c3af98bb97d2e8db4a0d20051a0f95ef6be858716aa2213a1655f1f7911cff89346eaf1df79001ec549922e35913306943faa2e366e1f577ab

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

@@ -4472,7 +4472,7 @@ var GbsRuntimeError = exports.GbsRuntimeError = function (_GbsInterpreterExcept3
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ASTConstructorDeclaration = exports.ASTFieldBinding = exports.ASTExprFunctionCall = exports.ASTExprStructureUpdate = exports.ASTExprStructure = exports.ASTExprTuple = exports.ASTExprRange = exports.ASTExprList = exports.ASTExprChoose = exports.ASTExprConstantString = exports.ASTExprConstantNumber = exports.ASTExprVariable = exports.ASTPatternTimeout = exports.ASTPatternTuple = exports.ASTPatternStructure = exports.ASTPatternNumber = exports.ASTPatternVariable = exports.ASTPatternWildcard = exports.ASTStmtProcedureCall = exports.ASTStmtAssignTuple = exports.ASTStmtAssignVariable = exports.ASTSwitchBranch = exports.ASTStmtSwitch = exports.ASTStmtWhile = exports.ASTStmtForeach = exports.ASTStmtRepeat = exports.ASTStmtIf = exports.ASTStmtReturn = exports.ASTStmtBlock = exports.ASTDefType = exports.ASTDefFunction = exports.ASTDefProcedure = exports.ASTDefInteractiveProgram = exports.ASTDefProgram = exports.ASTMain = exports.ASTNode = exports.N_ConstructorDeclaration = exports.N_FieldBinding = exports.N_SwitchBranch = exports.N_ExprFunctionCall = exports.N_ExprStructureUpdate = exports.N_ExprStructure = exports.N_ExprTuple = exports.N_ExprRange = exports.N_ExprList = exports.N_ExprChoose = exports.N_ExprConstantString = exports.N_ExprConstantNumber = exports.N_ExprVariable = exports.N_PatternTimeout = exports.N_PatternTuple = exports.N_PatternStructure = exports.N_PatternNumber = exports.N_PatternVariable = exports.N_PatternWildcard = exports.N_StmtProcedureCall = exports.N_StmtAssignTuple = exports.N_StmtAssignVariable = exports.N_StmtSwitch = exports.N_StmtWhile = exports.N_StmtForeach = exports.N_StmtRepeat = exports.N_StmtIf = exports.N_StmtReturn = exports.N_StmtBlock = exports.N_DefType = exports.N_DefFunction = exports.N_DefProcedure = exports.N_DefInteractiveProgram = exports.N_DefProgram = exports.N_Main = undefined;
+exports.ASTConstructorDeclaration = exports.ASTFieldBinding = exports.ASTExprFunctionCall = exports.ASTExprStructureUpdate = exports.ASTExprStructure = exports.ASTExprTuple = exports.ASTExprRange = exports.ASTExprList = exports.ASTExprMatching = exports.ASTExprChoose = exports.ASTExprConstantString = exports.ASTExprConstantNumber = exports.ASTExprVariable = exports.ASTPatternTimeout = exports.ASTPatternTuple = exports.ASTPatternStructure = exports.ASTPatternNumber = exports.ASTPatternVariable = exports.ASTPatternWildcard = exports.ASTStmtProcedureCall = exports.ASTStmtAssignTuple = exports.ASTStmtAssignVariable = exports.ASTMatchingBranch = exports.ASTSwitchBranch = exports.ASTStmtSwitch = exports.ASTStmtWhile = exports.ASTStmtForeach = exports.ASTStmtRepeat = exports.ASTStmtIf = exports.ASTStmtReturn = exports.ASTStmtBlock = exports.ASTDefType = exports.ASTDefFunction = exports.ASTDefProcedure = exports.ASTDefInteractiveProgram = exports.ASTDefProgram = exports.ASTMain = exports.ASTNode = exports.N_ConstructorDeclaration = exports.N_FieldBinding = exports.N_MatchingBranch = exports.N_SwitchBranch = exports.N_ExprFunctionCall = exports.N_ExprStructureUpdate = exports.N_ExprStructure = exports.N_ExprTuple = exports.N_ExprRange = exports.N_ExprList = exports.N_ExprMatching = exports.N_ExprChoose = exports.N_ExprConstantString = exports.N_ExprConstantNumber = exports.N_ExprVariable = exports.N_PatternTimeout = exports.N_PatternTuple = exports.N_PatternStructure = exports.N_PatternNumber = exports.N_PatternVariable = exports.N_PatternWildcard = exports.N_StmtProcedureCall = exports.N_StmtAssignTuple = exports.N_StmtAssignVariable = exports.N_StmtSwitch = exports.N_StmtWhile = exports.N_StmtForeach = exports.N_StmtRepeat = exports.N_StmtIf = exports.N_StmtReturn = exports.N_StmtBlock = exports.N_DefType = exports.N_DefFunction = exports.N_DefProcedure = exports.N_DefInteractiveProgram = exports.N_DefProgram = exports.N_Main = undefined;
 
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
 
@@ -4516,6 +4516,7 @@ var N_ExprVariable = exports.N_ExprVariable = Symbol.for('N_ExprVariable');
 var N_ExprConstantNumber = exports.N_ExprConstantNumber = Symbol.for('N_ExprConstantNumber');
 var N_ExprConstantString = exports.N_ExprConstantString = Symbol.for('N_ExprConstantString');
 var N_ExprChoose = exports.N_ExprChoose = Symbol.for('N_ExprChoose');
+var N_ExprMatching = exports.N_ExprMatching = Symbol.for('N_ExprMatching');
 var N_ExprList = exports.N_ExprList = Symbol.for('N_ExprList');
 var N_ExprRange = exports.N_ExprRange = Symbol.for('N_ExprRange');
 var N_ExprTuple = exports.N_ExprTuple = Symbol.for('N_ExprTuple');
@@ -4524,6 +4525,8 @@ var N_ExprStructureUpdate = exports.N_ExprStructureUpdate = Symbol.for('N_ExprSt
 var N_ExprFunctionCall = exports.N_ExprFunctionCall = Symbol.for('N_ExprFunctionCall');
 /* SwitchBranch: pattern -> body */
 var N_SwitchBranch = exports.N_SwitchBranch = Symbol.for('N_SwitchBranch');
+/* MatchingBranch: pattern -> body */
+var N_MatchingBranch = exports.N_MatchingBranch = Symbol.for('N_MatchingBranch');
 /* FieldBinding: fieldName <- value */
 var N_FieldBinding = exports.N_FieldBinding = Symbol.for('N_FieldBinding');
 /* ConstructorDeclaration */
@@ -5032,8 +5035,32 @@ var ASTSwitchBranch = exports.ASTSwitchBranch = function (_ASTNode14) {
   return ASTSwitchBranch;
 }(ASTNode);
 
-var ASTStmtAssignVariable = exports.ASTStmtAssignVariable = function (_ASTNode15) {
-  _inherits(ASTStmtAssignVariable, _ASTNode15);
+var ASTMatchingBranch = exports.ASTMatchingBranch = function (_ASTNode15) {
+  _inherits(ASTMatchingBranch, _ASTNode15);
+
+  function ASTMatchingBranch(pattern, body) {
+    _classCallCheck(this, ASTMatchingBranch);
+
+    return _possibleConstructorReturn(this, (ASTMatchingBranch.__proto__ || Object.getPrototypeOf(ASTMatchingBranch)).call(this, N_MatchingBranch, [pattern, body]));
+  }
+
+  _createClass(ASTMatchingBranch, [{
+    key: 'pattern',
+    get: function get() {
+      return this._children[0];
+    }
+  }, {
+    key: 'body',
+    get: function get() {
+      return this._children[1];
+    }
+  }]);
+
+  return ASTMatchingBranch;
+}(ASTNode);
+
+var ASTStmtAssignVariable = exports.ASTStmtAssignVariable = function (_ASTNode16) {
+  _inherits(ASTStmtAssignVariable, _ASTNode16);
 
   function ASTStmtAssignVariable(variable, value) {
     _classCallCheck(this, ASTStmtAssignVariable);
@@ -5056,8 +5083,8 @@ var ASTStmtAssignVariable = exports.ASTStmtAssignVariable = function (_ASTNode15
   return ASTStmtAssignVariable;
 }(ASTNode);
 
-var ASTStmtAssignTuple = exports.ASTStmtAssignTuple = function (_ASTNode16) {
-  _inherits(ASTStmtAssignTuple, _ASTNode16);
+var ASTStmtAssignTuple = exports.ASTStmtAssignTuple = function (_ASTNode17) {
+  _inherits(ASTStmtAssignTuple, _ASTNode17);
 
   function ASTStmtAssignTuple(variables, value) {
     _classCallCheck(this, ASTStmtAssignTuple);
@@ -5080,8 +5107,8 @@ var ASTStmtAssignTuple = exports.ASTStmtAssignTuple = function (_ASTNode16) {
   return ASTStmtAssignTuple;
 }(ASTNode);
 
-var ASTStmtProcedureCall = exports.ASTStmtProcedureCall = function (_ASTNode17) {
-  _inherits(ASTStmtProcedureCall, _ASTNode17);
+var ASTStmtProcedureCall = exports.ASTStmtProcedureCall = function (_ASTNode18) {
+  _inherits(ASTStmtProcedureCall, _ASTNode18);
 
   function ASTStmtProcedureCall(procedureName, args) {
     _classCallCheck(this, ASTStmtProcedureCall);
@@ -5106,8 +5133,8 @@ var ASTStmtProcedureCall = exports.ASTStmtProcedureCall = function (_ASTNode17)
 
 /* Patterns */
 
-var ASTPatternWildcard = exports.ASTPatternWildcard = function (_ASTNode18) {
-  _inherits(ASTPatternWildcard, _ASTNode18);
+var ASTPatternWildcard = exports.ASTPatternWildcard = function (_ASTNode19) {
+  _inherits(ASTPatternWildcard, _ASTNode19);
 
   function ASTPatternWildcard() {
     _classCallCheck(this, ASTPatternWildcard);
@@ -5125,8 +5152,8 @@ var ASTPatternWildcard = exports.ASTPatternWildcard = function (_ASTNode18) {
   return ASTPatternWildcard;
 }(ASTNode);
 
-var ASTPatternVariable = exports.ASTPatternVariable = function (_ASTNode19) {
-  _inherits(ASTPatternVariable, _ASTNode19);
+var ASTPatternVariable = exports.ASTPatternVariable = function (_ASTNode20) {
+  _inherits(ASTPatternVariable, _ASTNode20);
 
   function ASTPatternVariable(variableName) {
     _classCallCheck(this, ASTPatternVariable);
@@ -5149,8 +5176,8 @@ var ASTPatternVariable = exports.ASTPatternVariable = function (_ASTNode19) {
   return ASTPatternVariable;
 }(ASTNode);
 
-var ASTPatternNumber = exports.ASTPatternNumber = function (_ASTNode20) {
-  _inherits(ASTPatternNumber, _ASTNode20);
+var ASTPatternNumber = exports.ASTPatternNumber = function (_ASTNode21) {
+  _inherits(ASTPatternNumber, _ASTNode21);
 
   function ASTPatternNumber(number) {
     _classCallCheck(this, ASTPatternNumber);
@@ -5173,8 +5200,8 @@ var ASTPatternNumber = exports.ASTPatternNumber = function (_ASTNode20) {
   return ASTPatternNumber;
 }(ASTNode);
 
-var ASTPatternStructure = exports.ASTPatternStructure = function (_ASTNode21) {
-  _inherits(ASTPatternStructure, _ASTNode21);
+var ASTPatternStructure = exports.ASTPatternStructure = function (_ASTNode22) {
+  _inherits(ASTPatternStructure, _ASTNode22);
 
   function ASTPatternStructure(constructorName, parameters) {
     _classCallCheck(this, ASTPatternStructure);
@@ -5197,8 +5224,8 @@ var ASTPatternStructure = exports.ASTPatternStructure = function (_ASTNode21) {
   return ASTPatternStructure;
 }(ASTNode);
 
-var ASTPatternTuple = exports.ASTPatternTuple = function (_ASTNode22) {
-  _inherits(ASTPatternTuple, _ASTNode22);
+var ASTPatternTuple = exports.ASTPatternTuple = function (_ASTNode23) {
+  _inherits(ASTPatternTuple, _ASTNode23);
 
   function ASTPatternTuple(parameters) {
     _classCallCheck(this, ASTPatternTuple);
@@ -5216,8 +5243,8 @@ var ASTPatternTuple = exports.ASTPatternTuple = function (_ASTNode22) {
   return ASTPatternTuple;
 }(ASTNode);
 
-var ASTPatternTimeout = exports.ASTPatternTimeout = function (_ASTNode23) {
-  _inherits(ASTPatternTimeout, _ASTNode23);
+var ASTPatternTimeout = exports.ASTPatternTimeout = function (_ASTNode24) {
+  _inherits(ASTPatternTimeout, _ASTNode24);
 
   function ASTPatternTimeout(timeout) {
     _classCallCheck(this, ASTPatternTimeout);
@@ -5242,8 +5269,8 @@ var ASTPatternTimeout = exports.ASTPatternTimeout = function (_ASTNode23) {
 
 /* Expressions */
 
-var ASTExprVariable = exports.ASTExprVariable = function (_ASTNode24) {
-  _inherits(ASTExprVariable, _ASTNode24);
+var ASTExprVariable = exports.ASTExprVariable = function (_ASTNode25) {
+  _inherits(ASTExprVariable, _ASTNode25);
 
   function ASTExprVariable(variableName) {
     _classCallCheck(this, ASTExprVariable);
@@ -5261,8 +5288,8 @@ var ASTExprVariable = exports.ASTExprVariable = function (_ASTNode24) {
   return ASTExprVariable;
 }(ASTNode);
 
-var ASTExprConstantNumber = exports.ASTExprConstantNumber = function (_ASTNode25) {
-  _inherits(ASTExprConstantNumber, _ASTNode25);
+var ASTExprConstantNumber = exports.ASTExprConstantNumber = function (_ASTNode26) {
+  _inherits(ASTExprConstantNumber, _ASTNode26);
 
   function ASTExprConstantNumber(number) {
     _classCallCheck(this, ASTExprConstantNumber);
@@ -5280,8 +5307,8 @@ var ASTExprConstantNumber = exports.ASTExprConstantNumber = function (_ASTNode25
   return ASTExprConstantNumber;
 }(ASTNode);
 
-var ASTExprConstantString = exports.ASTExprConstantString = function (_ASTNode26) {
-  _inherits(ASTExprConstantString, _ASTNode26);
+var ASTExprConstantString = exports.ASTExprConstantString = function (_ASTNode27) {
+  _inherits(ASTExprConstantString, _ASTNode27);
 
   function ASTExprConstantString(string) {
     _classCallCheck(this, ASTExprConstantString);
@@ -5299,8 +5326,8 @@ var ASTExprConstantString = exports.ASTExprConstantString = function (_ASTNode26
   return ASTExprConstantString;
 }(ASTNode);
 
-var ASTExprChoose = exports.ASTExprChoose = function (_ASTNode27) {
-  _inherits(ASTExprChoose, _ASTNode27);
+var ASTExprChoose = exports.ASTExprChoose = function (_ASTNode28) {
+  _inherits(ASTExprChoose, _ASTNode28);
 
   function ASTExprChoose(condition, trueExpr, falseExpr) {
     _classCallCheck(this, ASTExprChoose);
@@ -5328,8 +5355,32 @@ var ASTExprChoose = exports.ASTExprChoose = function (_ASTNode27) {
   return ASTExprChoose;
 }(ASTNode);
 
-var ASTExprList = exports.ASTExprList = function (_ASTNode28) {
-  _inherits(ASTExprList, _ASTNode28);
+var ASTExprMatching = exports.ASTExprMatching = function (_ASTNode29) {
+  _inherits(ASTExprMatching, _ASTNode29);
+
+  function ASTExprMatching(subject, branches) {
+    _classCallCheck(this, ASTExprMatching);
+
+    return _possibleConstructorReturn(this, (ASTExprMatching.__proto__ || Object.getPrototypeOf(ASTExprMatching)).call(this, N_ExprMatching, [subject, branches]));
+  }
+
+  _createClass(ASTExprMatching, [{
+    key: 'subject',
+    get: function get() {
+      return this._children[0];
+    }
+  }, {
+    key: 'branches',
+    get: function get() {
+      return this._children[1];
+    }
+  }]);
+
+  return ASTExprMatching;
+}(ASTNode);
+
+var ASTExprList = exports.ASTExprList = function (_ASTNode30) {
+  _inherits(ASTExprList, _ASTNode30);
 
   function ASTExprList(elements) {
     _classCallCheck(this, ASTExprList);
@@ -5347,8 +5398,8 @@ var ASTExprList = exports.ASTExprList = function (_ASTNode28) {
   return ASTExprList;
 }(ASTNode);
 
-var ASTExprRange = exports.ASTExprRange = function (_ASTNode29) {
-  _inherits(ASTExprRange, _ASTNode29);
+var ASTExprRange = exports.ASTExprRange = function (_ASTNode31) {
+  _inherits(ASTExprRange, _ASTNode31);
 
   // Note: second may be null
   function ASTExprRange(first, second, last) {
@@ -5377,8 +5428,8 @@ var ASTExprRange = exports.ASTExprRange = function (_ASTNode29) {
   return ASTExprRange;
 }(ASTNode);
 
-var ASTExprTuple = exports.ASTExprTuple = function (_ASTNode30) {
-  _inherits(ASTExprTuple, _ASTNode30);
+var ASTExprTuple = exports.ASTExprTuple = function (_ASTNode32) {
+  _inherits(ASTExprTuple, _ASTNode32);
 
   function ASTExprTuple(elements) {
     _classCallCheck(this, ASTExprTuple);
@@ -5396,8 +5447,8 @@ var ASTExprTuple = exports.ASTExprTuple = function (_ASTNode30) {
   return ASTExprTuple;
 }(ASTNode);
 
-var ASTExprStructure = exports.ASTExprStructure = function (_ASTNode31) {
-  _inherits(ASTExprStructure, _ASTNode31);
+var ASTExprStructure = exports.ASTExprStructure = function (_ASTNode33) {
+  _inherits(ASTExprStructure, _ASTNode33);
 
   function ASTExprStructure(constructorName, fieldBindings) {
     _classCallCheck(this, ASTExprStructure);
@@ -5451,8 +5502,8 @@ var ASTExprStructure = exports.ASTExprStructure = function (_ASTNode31) {
   return ASTExprStructure;
 }(ASTNode);
 
-var ASTExprStructureUpdate = exports.ASTExprStructureUpdate = function (_ASTNode32) {
-  _inherits(ASTExprStructureUpdate, _ASTNode32);
+var ASTExprStructureUpdate = exports.ASTExprStructureUpdate = function (_ASTNode34) {
+  _inherits(ASTExprStructureUpdate, _ASTNode34);
 
   function ASTExprStructureUpdate(constructorName, original, fieldBindings) {
     _classCallCheck(this, ASTExprStructureUpdate);
@@ -5511,8 +5562,8 @@ var ASTExprStructureUpdate = exports.ASTExprStructureUpdate = function (_ASTNode
   return ASTExprStructureUpdate;
 }(ASTNode);
 
-var ASTExprFunctionCall = exports.ASTExprFunctionCall = function (_ASTNode33) {
-  _inherits(ASTExprFunctionCall, _ASTNode33);
+var ASTExprFunctionCall = exports.ASTExprFunctionCall = function (_ASTNode35) {
+  _inherits(ASTExprFunctionCall, _ASTNode35);
 
   function ASTExprFunctionCall(functionName, args) {
     _classCallCheck(this, ASTExprFunctionCall);
@@ -5535,8 +5586,8 @@ var ASTExprFunctionCall = exports.ASTExprFunctionCall = function (_ASTNode33) {
   return ASTExprFunctionCall;
 }(ASTNode);
 
-var ASTFieldBinding = exports.ASTFieldBinding = function (_ASTNode34) {
-  _inherits(ASTFieldBinding, _ASTNode34);
+var ASTFieldBinding = exports.ASTFieldBinding = function (_ASTNode36) {
+  _inherits(ASTFieldBinding, _ASTNode36);
 
   function ASTFieldBinding(fieldName, value) {
     _classCallCheck(this, ASTFieldBinding);
@@ -5559,8 +5610,8 @@ var ASTFieldBinding = exports.ASTFieldBinding = function (_ASTNode34) {
   return ASTFieldBinding;
 }(ASTNode);
 
-var ASTConstructorDeclaration = exports.ASTConstructorDeclaration = function (_ASTNode35) {
-  _inherits(ASTConstructorDeclaration, _ASTNode35);
+var ASTConstructorDeclaration = exports.ASTConstructorDeclaration = function (_ASTNode37) {
+  _inherits(ASTConstructorDeclaration, _ASTNode37);
 
   function ASTConstructorDeclaration(constructorName, fieldNames) {
     _classCallCheck(this, ASTConstructorDeclaration);
@@ -5618,6 +5669,9 @@ var T_ELSE = exports.T_ELSE = Symbol.for('T_ELSE');
 var T_CHOOSE = exports.T_CHOOSE = Symbol.for('T_CHOOSE');
 var T_WHEN = exports.T_WHEN = Symbol.for('T_WHEN');
 var T_OTHERWISE = exports.T_OTHERWISE = Symbol.for('T_OTHERWISE');
+var T_MATCHING = exports.T_MATCHING = Symbol.for('T_MATCHING');
+var T_SELECT = exports.T_SELECT = Symbol.for('T_SELECT');
+var T_ON = exports.T_ON = Symbol.for('T_ON');
 var T_REPEAT = exports.T_REPEAT = Symbol.for('T_REPEAT');
 var T_FOREACH = exports.T_FOREACH = Symbol.for('T_FOREACH');
 var T_IN = exports.T_IN = Symbol.for('T_IN');
@@ -8840,6 +8894,12 @@ var LOCALE_ES = exports.LOCALE_ES = {
   'T_MOD': keyword('mod'),
   'T_TYPE': keyword('type'),
   'T_IS': keyword('is'),
+  'T_CHOOSE': keyword('choose'),
+  'T_WHEN': keyword('when'),
+  'T_OTHERWISE': keyword('otherwise'),
+  'T_MATCHING': keyword('matching'),
+  'T_SELECT': keyword('select'),
+  'T_ON': keyword('on'),
   'T_RECORD': keyword('record'),
   'T_VARIANT': keyword('variant'),
   'T_CASE': keyword('case'),
@@ -9033,10 +9093,10 @@ var LOCALE_ES = exports.LOCALE_ES = {
     return 'El constructor "' + name + '" no está definido.';
   },
 
-  'errmsg:wildcard-pattern-should-be-last': 'El comodín "_" tiene que ser la última rama del switch.',
+  'errmsg:wildcard-pattern-should-be-last': 'El comodín "_" debe estar en la última rama.',
 
   'errmsg:variable-pattern-should-be-last': function errmsgVariablePatternShouldBeLast(name) {
-    return 'El patrón variable "' + name + '" tiene que ser la última rama del switch.';
+    return 'El patrón variable "' + name + '" tiene debe estar en la última rama.';
   },
 
   'errmsg:numeric-pattern-repeats-number': function errmsgNumericPatternRepeatsNumber(number) {
@@ -9059,7 +9119,7 @@ var LOCALE_ES = exports.LOCALE_ES = {
 
   'errmsg:patterns-in-interactive-program-must-be-events': 'Los patrones de un "interactive program" deben ser eventos.',
 
-  'errmsg:patterns-in-switch-must-not-be-events': 'Los patrones de un "switch" no pueden ser eventos.',
+  'errmsg:patterns-in-switch-must-not-be-events': 'El patrón no puede ser un evento.',
 
   'errmsg:structure-construction-repeated-field': function errmsgStructureConstructionRepeatedField(constructorName, fieldName) {
     return 'El campo "' + fieldName + '" está repetido en ' + 'la instanciación del constructor "' + constructorName + '".';
@@ -14480,6 +14540,8 @@ var Parser = exports.Parser = function () {
           return this._parseExprConstantString();
         case _token.T_CHOOSE:
           return this._parseExprChoose(true /* expectInitialChoose */);
+        case _token.T_MATCHING:
+          return this._parseExprMatching();
         case _token.T_UPPERID:
           return this._parseExprStructureOrStructureUpdate();
         case _token.T_LPAREN:
@@ -14566,6 +14628,21 @@ var Parser = exports.Parser = function () {
         return expr1;
       }
     }
+  }, {
+    key: '_parseExprMatching',
+    value: function _parseExprMatching() {
+      var startPos = this._currentToken.startPos;
+      this._match(_token.T_MATCHING);
+      this._match(_token.T_LPAREN);
+      var subject = this._parseExpression();
+      this._match(_token.T_RPAREN);
+      this._match(_token.T_SELECT);
+      var branches = this._parseMatchingBranches();
+      var result = new _ast.ASTExprMatching(subject, branches);
+      result.startPos = startPos;
+      result.endPos = result.endPos;
+      return result;
+    }
 
     /*
      * Parse any of the following constructions:
@@ -14826,6 +14903,47 @@ var Parser = exports.Parser = function () {
       return result;
     }
 
+    /** MatchingBranch **/
+
+  }, {
+    key: '_parseMatchingBranches',
+    value: function _parseMatchingBranches() {
+      var branches = [];
+      while (this._currentToken.tag !== _token.T_OTHERWISE) {
+        branches.push(this._parseMatchingBranch());
+      }
+      this._match(_token.T_OTHERWISE);
+      return branches;
+    }
+  }, {
+    key: '_parseMatchingBranch',
+    value: function _parseMatchingBranch() {
+      var body = this._parseExpression();
+      switch (this._currentToken.tag) {
+        case _token.T_ON:
+          {
+            this._match(_token.T_ON);
+            var pattern = this._parsePattern();
+            var result = new _ast.ASTMatchingBranch(pattern, body);
+            result.startPos = body.startPos;
+            result.endPos = pattern.endPos;
+            return result;
+          }
+        case _token.T_OTHERWISE:
+          {
+            var _pattern = new _ast.ASTPatternWildcard();
+            _pattern.startPos = this._currentToken.startPos;
+            _pattern.endPos = this._currentToken.endPos;
+            var _result2 = new _ast.ASTMatchingBranch(_pattern, body);
+            _result2.startPos = body.startPos;
+            _result2.endPos = this._currentToken.endPos;
+            return _result2;
+          }
+        default:
+          return fail(this._currentToken.startPos, this._currentToken.endPos, 'expected-but-found', [(0, _i18n.i18n)('<alternative>')([(0, _i18n.i18n)('T_ON'), (0, _i18n.i18n)('T_OTHERWISE')]), (0, _i18n.i18n)(Symbol.keyFor(this._currentToken.tag))]);
+      }
+    }
+
     /** FieldBinding **/
 
   }, {
@@ -15033,6 +15151,9 @@ var KEYWORDS = {
   'while': _token.T_WHILE,
   'switch': _token.T_SWITCH,
   'to': _token.T_TO,
+  'matching': _token.T_MATCHING,
+  'select': _token.T_SELECT,
+  'on': _token.T_ON,
   /* Assignment */
   'let': _token.T_LET,
   /* Operators */
@@ -16057,6 +16178,11 @@ var Linter = exports.Linter = function () {
   }, {
     key: '_lintSwitchBranches',
     value: function _lintSwitchBranches(branches, isInteractiveProgram) {
+      this._lintBranches(branches, isInteractiveProgram, false /* isMatching */);
+    }
+  }, {
+    key: '_lintBranches',
+    value: function _lintBranches(branches, isInteractiveProgram, isMatching) {
       /* Check that each pattern is well-formed */
       var _iteratorNormalCompletion8 = true;
       var _didIteratorError8 = false;
@@ -16083,13 +16209,13 @@ var Linter = exports.Linter = function () {
         }
       }
 
-      this._switchBranchesCheckWildcardAndVariable(branches);
-      this._switchBranchesCheckNoRepeats(branches);
-      this._switchBranchesCheckCompatible(branches);
+      this._branchesCheckWildcardAndVariable(branches);
+      this._branchesCheckNoRepeats(branches);
+      this._branchesCheckCompatible(branches);
       if (isInteractiveProgram) {
-        this._switchBranchesCheckTypeEvent(branches);
+        this._branchesCheckTypeEvent(branches);
       } else {
-        this._switchBranchesCheckTypeNotEvent(branches);
+        this._branchesCheckTypeNotEvent(branches);
       }
 
       /* Lint recursively each branch */
@@ -16101,7 +16227,7 @@ var Linter = exports.Linter = function () {
         for (var _iterator9 = branches[Symbol.iterator](), _step9; !(_iteratorNormalCompletion9 = (_step9 = _iterator9.next()).done); _iteratorNormalCompletion9 = true) {
           var _branch = _step9.value;
 
-          this._lintSwitchBranchBody(_branch);
+          this._lintBranchBody(_branch, isMatching);
         }
       } catch (err) {
         _didIteratorError9 = true;
@@ -16122,8 +16248,8 @@ var Linter = exports.Linter = function () {
     /* Check that there is at most one wildcard/variable pattern at the end */
 
   }, {
-    key: '_switchBranchesCheckWildcardAndVariable',
-    value: function _switchBranchesCheckWildcardAndVariable(branches) {
+    key: '_branchesCheckWildcardAndVariable',
+    value: function _branchesCheckWildcardAndVariable(branches) {
       var i = 0;
       var n = branches.length;
       var _iteratorNormalCompletion10 = true;
@@ -16162,8 +16288,8 @@ var Linter = exports.Linter = function () {
      * of branches. */
 
   }, {
-    key: '_switchBranchesCheckNoRepeats',
-    value: function _switchBranchesCheckNoRepeats(branches) {
+    key: '_branchesCheckNoRepeats',
+    value: function _branchesCheckNoRepeats(branches) {
       var coveredNumbers = {};
       var coveredConstructors = {};
       var coveredTuples = {};
@@ -16231,8 +16357,8 @@ var Linter = exports.Linter = function () {
      * i.e. that they belong to the same type */
 
   }, {
-    key: '_switchBranchesCheckCompatible',
-    value: function _switchBranchesCheckCompatible(branches) {
+    key: '_branchesCheckCompatible',
+    value: function _branchesCheckCompatible(branches) {
       var expectedType = null;
       var _iteratorNormalCompletion12 = true;
       var _didIteratorError12 = false;
@@ -16268,8 +16394,8 @@ var Linter = exports.Linter = function () {
     /* Check that there are patterns are of type Event */
 
   }, {
-    key: '_switchBranchesCheckTypeEvent',
-    value: function _switchBranchesCheckTypeEvent(branches) {
+    key: '_branchesCheckTypeEvent',
+    value: function _branchesCheckTypeEvent(branches) {
       var _iteratorNormalCompletion13 = true;
       var _didIteratorError13 = false;
       var _iteratorError13 = undefined;
@@ -16302,8 +16428,8 @@ var Linter = exports.Linter = function () {
     /* Check that there are no patterns of type Event */
 
   }, {
-    key: '_switchBranchesCheckTypeNotEvent',
-    value: function _switchBranchesCheckTypeNotEvent(branches) {
+    key: '_branchesCheckTypeNotEvent',
+    value: function _branchesCheckTypeNotEvent(branches) {
       var _iteratorNormalCompletion14 = true;
       var _didIteratorError14 = false;
       var _iteratorError14 = undefined;
@@ -16336,8 +16462,8 @@ var Linter = exports.Linter = function () {
     /* Recursively lint the body of each branch. Locally bind variables. */
 
   }, {
-    key: '_lintSwitchBranchBody',
-    value: function _lintSwitchBranchBody(branch) {
+    key: '_lintBranchBody',
+    value: function _lintBranchBody(branch, isMatching) {
       var _iteratorNormalCompletion15 = true;
       var _didIteratorError15 = false;
       var _iteratorError15 = undefined;
@@ -16363,7 +16489,11 @@ var Linter = exports.Linter = function () {
         }
       }
 
-      this._lintStatement(branch.body);
+      if (isMatching) {
+        this._lintExpression(branch.body);
+      } else {
+        this._lintStatement(branch.body);
+      }
       var _iteratorNormalCompletion16 = true;
       var _didIteratorError16 = false;
       var _iteratorError16 = undefined;
@@ -16582,6 +16712,8 @@ var Linter = exports.Linter = function () {
           return this._lintExprConstantString(expression);
         case _ast.N_ExprChoose:
           return this._lintExprChoose(expression);
+        case _ast.N_ExprMatching:
+          return this._lintExprMatching(expression);
         case _ast.N_ExprList:
           return this._lintExprList(expression);
         case _ast.N_ExprRange:
@@ -16622,6 +16754,19 @@ var Linter = exports.Linter = function () {
       this._lintExpression(expression.trueExpr);
       this._lintExpression(expression.falseExpr);
     }
+  }, {
+    key: '_lintExprMatching',
+    value: function _lintExprMatching(expression) {
+      this._lintExpression(expression.subject);
+      this._lintMatchingBranches(expression.branches);
+    }
+  }, {
+    key: '_lintMatchingBranches',
+    value: function _lintMatchingBranches(branches) {
+      this._lintBranches(branches, false /* !isInteractiveProgram */
+      , true /* isMatching */
+      );
+    }
   }, {
     key: '_lintExprList',
     value: function _lintExprList(expression) {
@@ -17322,7 +17467,7 @@ var Compiler = exports.Compiler = function () {
   }, {
     key: '_compileDefInteractiveProgram',
     value: function _compileDefInteractiveProgram(definition) {
-      this._compileMatchSwitchBranches(definition);
+      this._compileMatchBranches(definition, false /* isMatching */);
       this._produce(definition.startPos, definition.endPos, new _instruction.IReturn());
     }
 
@@ -17673,11 +17818,11 @@ var Compiler = exports.Compiler = function () {
     value: function _compileStmtSwitch(statement) {
       /* Compile the subject */
       this._compileExpression(statement.subject);
-      this._compileMatchSwitchBranches(statement);
+      this._compileMatchBranches(statement, false /* !isMatching */);
     }
   }, {
-    key: '_compileMatchSwitchBranches',
-    value: function _compileMatchSwitchBranches(statement) {
+    key: '_compileMatchBranches',
+    value: function _compileMatchBranches(statement, isMatching) {
       var branchLabels = [];
       /* Attempt to match each pattern */
       var _iteratorNormalCompletion4 = true;
@@ -17719,7 +17864,11 @@ var Compiler = exports.Compiler = function () {
         this._produce(branch.startPos, branch.endPos, new _instruction.ILabel(label));
         this._compilePatternBind(branch.pattern);
         this._produce(branch.startPos, branch.endPos, new _instruction.IPop());
-        this._compileStatement(branch.body);
+        if (isMatching) {
+          this._compileExpression(branch.body);
+        } else {
+          this._compileStatement(branch.body);
+        }
         this._compilePatternUnbind(branch.pattern);
         this._produce(branch.startPos, branch.endPos, new _instruction.IJump(labelEnd));
       }
@@ -17995,6 +18144,8 @@ var Compiler = exports.Compiler = function () {
           return this._compileExprConstantString(expression);
         case _ast.N_ExprChoose:
           return this._compileExprChoose(expression);
+        case _ast.N_ExprMatching:
+          return this._compileExprMatching(expression);
         case _ast.N_ExprList:
           return this._compileExprList(expression);
         case _ast.N_ExprRange:
@@ -18069,6 +18220,12 @@ var Compiler = exports.Compiler = function () {
       this._compileExpression(expression.falseExpr);
       this._produce(expression.startPos, expression.endPos, new _instruction.ILabel(labelEnd));
     }
+  }, {
+    key: '_compileExprMatching',
+    value: function _compileExprMatching(expression) {
+      this._compileExpression(expression.subject);
+      this._compileMatchBranches(expression, true /* isMatching */);
+    }
   }, {
     key: '_compileExprList',
     value: function _compileExprList(expression) {

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

@@ -1,5 +1,5 @@
 module Gobstones
   module CodeRunner
-    VERSION = "0.5.4"
+    VERSION = "0.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gobstones-code-runner
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
 platform: ruby
 authors:
 - Rodrigo Alfonso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-04 00:00:00.000000000 Z
+date: 2018-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler