gobstones-code-runner 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e4285778bfc03d0ece1c37c5279f61d1c0696f25943ef5c4bf9abb7136ae3f5
-  data.tar.gz: 3851219e420573ce04cd2510da0dd1c8c0c01be823298830ead2577c7da3b53f
+  metadata.gz: c753732e0686c2b15d104e5040fe90f3ac732f63acb4782eaff3f0651823a13c
+  data.tar.gz: 9377a6de2f1e8daca3eb45064a4a64ad3797b07d9ecd74c7ea8bb6216cdd968e
 SHA512:
-  metadata.gz: fa4f7b969ff2ed2626478dd0db313d5e24261bb16d573fce02d8d085bf7e321e645ff790e11b9b5db5def4da64eed3cb8802c4b67fa566b854c0628c592c5c87
-  data.tar.gz: a219c627c4f4b9bae47d9e18faed329848ce10e143ccf8358f8f3557bf159e9920ffc1d1f40c311a6d910c9a79ec3f9d7b256f59fe3e533bfd6d3f259bb930d8
+  metadata.gz: 218aa61a1d56e59cc195c534912f4b8f0a3d9c298221ef80c0e0d851702a7a421b531a48d553329a02af436695032659b264287e85cc4a8fb6938f84f7e2bd3b
+  data.tar.gz: 77b564c6fe24a79bb1913e753084acfe39dfb77e6b7a52ce3b0ba87ff3f2928e49328e4ecdde3225b64603f5f170539ff2407f6c65223f2d17872de2a154e6f2

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

@@ -4367,7 +4367,7 @@ function i18n(message) {
 
 function i18nWithLanguage(code, thunk) {
   if (!(code in dictionaries)) {
-    throw Error('Invlid language code: ' + code);
+    throw Error('Invalid language code: ' + code);
   }
   var oldLanguage = CURRENT_LANGUAGE;
   CURRENT_LANGUAGE = code;
@@ -6394,6 +6394,17 @@ var RuntimePrimitives = exports.RuntimePrimitives = function () {
       }
     }
 
+    this._primitiveProcedures[(0, _i18n.i18n)('PRIM:TypeCheck')] = new PrimitiveOperation([typeAny, typeAny, typeString], function (startPos, endPos, globalState, args) {
+      var v1 = args[0];
+      var v2 = args[1];
+      var errorMessage = args[2];
+      if ((0, _value.joinTypes)(v1.type(), v2.type()) === null) {
+        fail(startPos, endPos, 'typecheck-failed', [errorMessage.string, v1.type(), v2.type()]);
+      }
+    }, function (globalState, color) {
+      return null;
+    });
+
     this._primitiveProcedures[(0, _i18n.i18n)('PRIM:PutStone')] = new PrimitiveOperation([typeColor()], noValidation, function (globalState, color) {
       globalState.putStone(colorFromValue(color));
       return null;
@@ -6607,6 +6618,15 @@ var RuntimePrimitives = exports.RuntimePrimitives = function () {
       return a.mod(b);
     });
 
+    this._primitiveFunctions['^'] = new PrimitiveOperation([typeInteger, typeInteger], function (startPos, endPos, globalState, args) {
+      var b = args[1];
+      if (b.lt(new _value.ValueInteger(0))) {
+        fail(startPos, endPos, 'negative-exponent', []);
+      }
+    }, function (globalState, a, b) {
+      return a.pow(b);
+    });
+
     this._primitiveFunctions['-(unary)'] = new PrimitiveOperation([typeAny], function (startPos, endPos, globalState, args) {
       var a = args[0];
       validateTypeAmong(startPos, endPos, a, typesWithOpposite());
@@ -7557,6 +7577,16 @@ var ValueInteger = exports.ValueInteger = function (_Value) {
       var q = this.div(other);
       return this.sub(q.mul(other));
     }
+
+    /* Assumes that 'other' is non-negative */
+
+  }, {
+    key: 'pow',
+    value: function pow(other) {
+      var a = (0, _bigint.Integer)(this._number);
+      var b = (0, _bigint.Integer)(other._number);
+      return new ValueInteger(a.pow(b).toString());
+    }
   }, {
     key: 'eq',
     value: function eq(other) {
@@ -8751,6 +8781,29 @@ function openingDelimiterName(delimiter) {
   }
 }
 
+function formatTypes(string, type1, type2) {
+  var result = '';
+  for (var i = 0; i < string.length; i++) {
+    if (string[i] === '%' && i + 1 < string.length) {
+      if (string[i + 1] === '%') {
+        result += '%';
+        i++;
+      } else if (string[i + 1] === '1') {
+        result += typeAsNoun(type1);
+        i++;
+      } else if (string[i + 1] === '2') {
+        result += typeAsNoun(type2);
+        i++;
+      } else {
+        result += '%';
+      }
+    } else {
+      result += string[i];
+    }
+  }
+  return result;
+}
+
 var LOCALE_ES = exports.LOCALE_ES = {
 
   /* Descriptions of syntactic constructions and tokens */
@@ -9109,12 +9162,19 @@ var LOCALE_ES = exports.LOCALE_ES = {
 
   'errmsg:cannot-divide-by-zero': 'No se puede dividir por cero.',
 
+  'errmsg:negative-exponent': 'El exponente de la potencia no puede ser negativo.',
+
   'errmsg:list-cannot-be-empty': 'La lista no puede ser vacía.',
 
   'errmsg:timeout': function errmsgTimeout(millisecs) {
     return 'La ejecución del programa demoró más de ' + millisecs.toString() + 'ms.';
   },
 
+  /* Typecheck */
+  'errmsg:typecheck-failed': function errmsgTypecheckFailed(errorMessage, type1, type2) {
+    return formatTypes(errorMessage, type1, type2);
+  },
+
   /* Board operations */
   'errmsg:cannot-move-to': function errmsgCannotMoveTo(dirName) {
     return 'No se puede mover hacia la dirección ' + dirName + ': cae afuera del tablero.';
@@ -9151,6 +9211,7 @@ var LOCALE_ES = exports.LOCALE_ES = {
   'CONS:Dir2': 'Sur',
   'CONS:Dir3': 'Oeste',
 
+  'PRIM:TypeCheck': 'TypeCheck',
   'PRIM:BOOM': 'BOOM',
   'PRIM:boom': 'boom',
 

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

@@ -1,5 +1,5 @@
 module Gobstones
   module CodeRunner
-    VERSION = "0.3.1"
+    VERSION = "0.4.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gobstones-code-runner
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Rodrigo Alfonso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-09 00:00:00.000000000 Z
+date: 2018-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Gobstones Code Runner