prolog-blockly 1.0.13 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef3c9caefa2689a699cbb66594519b077360d5ff7f490ce27b9247ea2dfdbee9
-  data.tar.gz: ef17cc5ca934e0f8517dd100efb1c5d62025bba880378e95590414bddd749124
+  metadata.gz: f2844a64863dbc7b2ae9ed79348d67e4727b32853a9e8f7a2a981546abd5d462
+  data.tar.gz: 748de21db30187284247da28485c898b31f386e2de32ee968bf8e0176d8b2949
 SHA512:
-  metadata.gz: 8b1f0850497c197a816f72deebbe1dc3721ab5c5d0bd5c96e705fd4b9cb0d3e770c3c145c08e6e3f2b0c21a48c790a7ddc35eac2f476b97f4919037b819f4592
-  data.tar.gz: 6a768f798871b75a221b99800486e8a22b7ebb34e66bbf1c39399220d985f1d225919cf186fa29131c81bf5d6c30dff17a783d154c18933637d1744a5b91169e
+  metadata.gz: b70e5148ba641a39a3922e2f73b8463232c7508e5b6e04a8a4ac10b21fcff1f20ccda274542cbe9b20cb50100bb3570fda2735a47cdd2ab0b05fac5e6002a182
+  data.tar.gz: deb2c258e1e4a7613af5f5a46a37c3a99ea00f9eda6eb2774ea90c680363b6d3e674c4da3d0e4205d56cd89c06e293031d57700e67ee17bc9382db19d11ac07a

data/app/assets/htmls/pl-element-blockly.html

@@ -39,14 +39,17 @@ Example:
       </category>
       <category name="Comandos">
           <block type="forall"></block>
+          <block type="not"></block>
       </category>
-      <category name="Individuos y Variables">
+      <category name="Individuos">
         <block type="IndividuoSelector"></block>
+      </category>
+      <category name="Variables">
         <block type="VariableSelector"></block>
       </category>
-      <category name="Mis predicados" custom="PROCEDURE_CALLS">
+      <category name="Mis condiciones" custom="PROCEDURE_CALLS">
       </category>
-      <category name="Predicados">
+      <category name="Condiciones">
         <block type="procedures_defnoreturn"></block>
       </category>
       <category name="Asignación">
@@ -4328,7 +4331,7 @@ Blockly.CUSTOM_COLORS.variable = Blockly.MUMUKI_COLORS.blue;
 Blockly.CUSTOM_COLORS.parameter = Blockly.MUMUKI_COLORS.blue;
 Blockly.CUSTOM_COLORS.primitiveFunction = Blockly.MUMUKI_COLORS.blue;
 Blockly.CUSTOM_COLORS.function_call = Blockly.MUMUKI_COLORS.blue;
-	
+
 /**
  * Create the svg representation of a block and render
  * @name {!string} name of the parameter.
@@ -4847,7 +4850,7 @@ Blockly.Blocks.fact1 = {
 					type: "field_input",
 					name: 'Nombre',
 					text: 'Nombre'
-				},	
+				},
 				{
 					type: 'input_value',
 					name: 'PrimerIndividuo'
@@ -4871,8 +4874,8 @@ Blockly.Blocks.fact2 = {
 				{
 					type: "field_input",
 					name: 'Nombre',
-					text: 'Nombre' 
-				},	
+					text: 'Nombre'
+				},
 				{
 					type: 'input_value',
 					name: 'PrimerIndividuo'
@@ -4901,7 +4904,7 @@ Blockly.Blocks.fact3 = {
 					type: "field_input",
 					name: 'Nombre',
 					text: 'Nombre'
-				},	
+				},
 				{
 					type: 'input_value',
 					name: 'PrimerIndividuo'
@@ -4922,6 +4925,26 @@ Blockly.Blocks.fact3 = {
 	}
 };
 
+Blockly.Blocks.not = {
+	init: function () {
+		this.jsonInit({
+			message0: 'No %1',
+			type: "Statement",
+			previousStatement: "Statement",
+			nextStatement: "Statement",
+			args0: [
+				{
+					type: 'input_statement',
+					name: 'PrimeraCondicion'
+				}
+			],
+			colour: Blockly.CUSTOM_COLORS.Not || Blockly.CUSTOM_COLORS.primitiveCommand,
+			tooltip: 'Niega la condición',
+			inputsInline: true
+		});
+	}
+};
+
 Blockly.Blocks.forall = {
 	init: function () {
 		this.jsonInit({
@@ -5364,7 +5387,6 @@ Blockly.Blocks.variables_get = {
 	}
 };
 
-Blockly.Blocks.not = createSingleParameterExpressionBlock('no','Bool');
 Blockly.Blocks.siguiente = createSingleParameterExpressionBlock('siguiente','*');
 Blockly.Blocks.previo = createSingleParameterExpressionBlock('previo','*');
 Blockly.Blocks.opuesto = createSingleParameterExpressionBlock('opuesto','*');
@@ -5470,7 +5492,7 @@ function callGenerator(name, args = [], newLine, order) {
 
 function uncapitalize(text) {
 	if(!text || typeof text !== "string") {
-	   return ''; 
+	   return '';
 	}
 	return text.charAt(0).toLowerCase() + text.substr(1);
 }
@@ -5514,6 +5536,27 @@ function forallBlockCodeGenerator(procName, args, newLine) {
 }
 window.forallBlockCodeGenerator = forallBlockCodeGenerator;
 
+function notBlockCodeGenerator(procName, args, newLine) {
+	return function (block) {
+		var code = "\n" + procName + '(';
+		var sep = '';
+		debugger;
+		args.forEach(function (arg) {
+		  var statementCode = Blockly.PrologLanguage.statementToCode(block, arg, false);
+		  if(statementCode.split("\n").length > 2) {
+		  	code += sep + "(" + Blockly.PrologLanguage.statementToCode(block, arg, false).replace(/\n/g, "").replace(". ", ",") + ")";
+		  } else {
+		  	code += sep + statementCode.replace("\n", "");
+		  }
+		  sep = ', ';
+		});
+		code += newLine ? ').\n' : ').';
+		code = code.replace(/\.,/g, ',').replace(/\.\)/g, ')');
+		return code;
+	  };
+	// return callGenerator(procName, args, true);
+}
+window.forallBlockCodeGenerator = forallBlockCodeGenerator;
 /**
  * Retorna la funcion que genera el codigo para un bloque tipo function(arg1, arg2, ...)
  */
@@ -5751,6 +5794,7 @@ Blockly.PrologLanguage.fact1 = factBlockCodeGenerator('fact', ['PrimerIndividuo'
 Blockly.PrologLanguage.fact2 = factBlockCodeGenerator('fact', ['PrimerIndividuo', 'SegundoIndividuo']);
 Blockly.PrologLanguage.fact3 = factBlockCodeGenerator('fact', ['PrimerIndividuo', 'SegundoIndividuo', 'TercerIndividuo']);
 Blockly.PrologLanguage.forall = forallBlockCodeGenerator('forall', ['PrimeraCondicion', 'SegundaCondicion']);
+Blockly.PrologLanguage.not = notBlockCodeGenerator('not', ['PrimeraCondicion']);
 
 Blockly.PrologLanguage.ComandoCompletar = b => 'BOOM("El programa todavía no está completo")\n';
 Blockly.PrologLanguage.ExpresionCompletar = b => ['boom("El programa todavía no está completo")',Blockly.PrologLanguage.ORDER_FUNCTION_CALL];
@@ -5809,7 +5853,6 @@ Blockly.PrologLanguage.OperadorLogico = function(block) {
 	return [code, order];
 };
 
-Blockly.PrologLanguage.not = exprParamsBlockCodeGenerator('not',['VALUE']);
 Blockly.PrologLanguage.siguiente = exprParamsBlockCodeGenerator('siguiente',['VALUE']);
 Blockly.PrologLanguage.previo = exprParamsBlockCodeGenerator('previo',['VALUE']);
 Blockly.PrologLanguage.opuesto = exprParamsBlockCodeGenerator('opuesto',['VALUE']);
@@ -5939,7 +5982,7 @@ Blockly.PrologLanguage.procedures_defnoreturn = function (block) {
   var body2 = body_lines.split("\n").slice(1).join(",\n") + '.';
   var body_final = body2.replace(/\.\./g, ".").replace(/\.,/g, ",");
 
-  var code = name + '(' + makeParameterList(block) + ')' + ':- \n' + body_final + '\n'; 
+  var code = name + '(' + makeParameterList(block) + ')' + ':- \n' + body_final + '\n';
 
   code = Blockly.PrologLanguage.scrub_(block, code);
   Blockly.PrologLanguage.definitions_[procName] = code;
@@ -5949,7 +5992,7 @@ Blockly.PrologLanguage.procedures_defnoreturn = function (block) {
 
 Blockly.PrologLanguage.procedures_defnoreturn_nobody = function (block) {
   var name = formatCallName(block.getFieldValue('NAME'),false);
-  var code = name + '(' + makeParameterList(block) + ').'; 
+  var code = name + '(' + makeParameterList(block) + ').';
   code = Blockly.PrologLanguage.scrub_(block, code);
   Blockly.PrologLanguage.definitions_[name] = code;
   return null;
@@ -7054,4 +7097,5 @@ Blockly.ErrorInforming.CssContent = [
       }
     });
   </script>
-</dom-module></body></html>
+</dom-module>
+</body></html>

data/lib/prolog/blockly/version.rb

@@ -1,5 +1,5 @@
 module Prolog
   module Blockly
-    VERSION = "1.0.13"
+    VERSION = "1.0.14"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prolog-blockly
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors:
 - Agustin Pina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-25 00:00:00.000000000 Z
+date: 2018-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler