Update 'js/util/codeParser.js'

* Indentation + comments
 * Changes in 'parseWriter(command, function_obj)' to read and presents "write(a," ",b)"
   Send "command.content" to "CodeParser.expressionParserCodeVisual(.)" instead of only "command.content[0]"

js/util/codeParser.js

@@ -1,3 +1,5 @@
+// iVProg - www.usp.br/line/ivprog
+// LInE - Free Education, Private Data
 
 import * as Models from '../visualUI/ivprog_elements';
 import { LocalizedStrings } from "./../services/localizedStringsService";
@@ -11,29 +13,26 @@ function parseBoolean (var_value, dimensions) {
     var final_array = [];
     var_value.forEach(function(el){
       final_array.push(el == LocalizedStrings.getUI("logic_value_true"));
-    });
+      });
     return final_array;
-  }
+    }
   if (dimensions == 2) {
     var final_array = [];
     var_value.forEach(function(row){
       var temp = [];
       row.forEach(function(el){
         temp.push(el == LocalizedStrings.getUI("logic_value_true"));
-      });
+        });
       final_array.push(temp);
-    });
+      });
     return final_array;
+    }
   }
-}
+
 
 function parseGlobal (global_obj) {
+  var new_global = new Models.Variable(global_obj.type, global_obj.name, global_obj.value);
 
-  var new_global = new Models.Variable(
-    global_obj.type, 
-    global_obj.name, 
-    global_obj.value);
-  
   new_global.is_constant = global_obj.is_const;
   new_global.columns = global_obj.columns;
   new_global.dimensions = global_obj.dimension;
@@ -41,12 +40,12 @@ function parseGlobal (global_obj) {
 
   if (global_obj.type == "boolean")
     new_global.value = parseBoolean(global_obj.value, global_obj.dimension);
-	
-	window.program_obj.addGlobal(new_global);
-}
 
-function parseParameter (parameter_obj) {
+  window.program_obj.addGlobal(new_global);
+  }
 
+
+function parseParameter (parameter_obj) {
   const new_parameter = new Models.Variable(
     parameter_obj.type,
     parameter_obj.name,
@@ -56,7 +55,7 @@ function parseParameter (parameter_obj) {
     parameter_obj.rows,
     parameter_obj.columns,
     parameter_obj.reference
-  );
+    );
 
   new_parameter.value = parameter_obj.value;
 
@@ -64,42 +63,35 @@ function parseParameter (parameter_obj) {
     new_parameter.value = parseBoolean(parameter_obj.value, parameter_obj.dimension);
 
   return new_parameter;
-}
+  }
+
 
 function parseFunction (function_obj) {
+  const new_function = new Models.Function(function_obj.name, function_obj.return_type, function_obj.return_dimensions, [], false, false, []);
 
-  const new_function = new Models.Function(
-    function_obj.name, 
-    function_obj.return_type, 
-    function_obj.return_dimensions, 
-    [], 
-    false, 
-    false, 
-    []);
-  
   if (!new_function.name) {
     new_function.name = LocalizedStrings.getUI("start");
     new_function.is_main = true;
-  }
+    }
 
   if (function_obj.parameters_list) {
     function_obj.parameters_list.forEach(function(el){
       new_function.parameters_list.push(parseParameter(el));
-    });
-  }
+      });
+    }
 
   if (function_obj.variables_list) {
     function_obj.variables_list.forEach(function(el){
       new_function.variables_list.push(parseParameter(el));
-    });
-  }
+      });
+    }
 
   window.program_obj.addFunction(new_function);
-  
-}
+  }
 
-export function parserCodeVisual (code_obj = null) {
 
+export function parserCodeVisual (code_obj = null) {
+  console.log(".ivprog/js/util/codeParser.js: parserCodeVisual(.)");
   window.conteudo = code_obj
 
   // Globals:
@@ -113,134 +105,123 @@ export function parserCodeVisual (code_obj = null) {
   // Commands: 
   window.program_obj.functions.forEach(function(preparedFunction) {
     code_obj.functions.forEach(function(rawFunction) {
-      if ((preparedFunction.name == rawFunction.name) 
-          || 
-          (!rawFunction.name && preparedFunction.name == LocalizedStrings.getUI("start"))) {
-            preparedFunction.commands = parseCommands(rawFunction.commands, preparedFunction);
-          }
-    })
-  });
+      if ((preparedFunction.name == rawFunction.name) || (!rawFunction.name && preparedFunction.name == LocalizedStrings.getUI("start"))) {
+        preparedFunction.commands = parseCommands(rawFunction.commands, preparedFunction);
+        }
+      })
+    });
+  }
 
-}
 
 function parseCommands (commands_block, function_obj) {
-
+  console.log(".ivprog/js/util/codeParser.js: parseCommands(.): commands_block=" + JSON.stringify(commands_block));
   if (Array.isArray(commands_block)) {
     var temp = [];
     commands_block.forEach(function(command) {
       temp.push(parseCommands(command, function_obj));
-    });
+      });
     return temp;
-  }
+    }
   else {
     switch (commands_block.type) {
       case Models.COMMAND_TYPES.reader:
         return parseReader(commands_block, function_obj);
-
       case Models.COMMAND_TYPES.return:
         return parseReturn(commands_block, function_obj);
-
       case Models.COMMAND_TYPES.writer:
         return parseWriter(commands_block, function_obj);
-
       case Models.COMMAND_TYPES.break:
         return parseBreak(commands_block, function_obj);
-
       case Models.COMMAND_TYPES.comment:
         return parseComment(commands_block, function_obj);
-
       case Models.COMMAND_TYPES.attribution:
         return parseAttribution(commands_block, function_obj);
-
       case Models.COMMAND_TYPES.functioncall:
         return parseFunctionCall(commands_block, function_obj);
-
       case Models.COMMAND_TYPES.iftrue:
         return parseIfTrue(commands_block, function_obj);
-
       case Models.COMMAND_TYPES.repeatNtimes:
         return parseRepeatNTimes(commands_block, function_obj);
-
       case Models.COMMAND_TYPES.whiletrue:
         return parseWhileTrue(commands_block, function_obj);
-
       case Models.COMMAND_TYPES.dowhiletrue:
         return parseDoWhileTrue(commands_block, function_obj);
-
       case Models.COMMAND_TYPES.switch:
         return parseSwitch(commands_block, function_obj);
-    }
+      }
     return null;
+    }
   }
-  
-}
+
 
 function parseReader (command, function_obj) {
   var temp = CodeParser.expressionParserCodeVisual(command.variable, function_obj);
-
   if (Array.isArray(temp) && temp[0])
     temp = temp[0];
+  return new Models.Reader(temp);
+  }
 
-  return new Models.Reader(
-    temp
-  );
-}
 
 function parseReturn (command, function_obj) {
-
   var temp = CodeParser.expressionParserCodeVisual(command.expression, function_obj);
+  return new Models.Return(temp);
+  }
 
-  return new Models.Return(
-    temp
-  );
-
-}
 
+// Generate command "write(...)"
+// @calls js/visualUI/commands/attribution.js: renderExpression
 function parseWriter (command, function_obj) {
+  //D var len_cmd = command.content.length; //leo
+  //D var str = ""; // "#command.content=" + len_cmd + "\n"; //leo
+  //D for (var i=0; i<len_cmd; i++) str += JSON.stringify(command.content[i]) + "; "; // "; " + command.content[i];
+  //D console.log("./ivprog/js/util/codeParser.js: parseWriter(.): command=" + JSON.stringify(command)) // + "\nfunction_obj=||" + JSON.stringify(function_obj) + "||\n" + str); //leo
+  console.log("./ivprog/js/util/codeParser.js: parseWriter(.): command=" + JSON.stringify(command));
+  //#command=" + (command ? command.length : "<>") ); //leo + ";
+
+  //leo
+  //TODO It is missing to implement the visualUI construtor to "write_separator" in 'getVariable(.)'
+  //TODO Incomplete solution: I change "Models.EXPRESSION_TYPES.write_sep" to "Models.ARITHMETIC_TYPES.plus" in ./ivprog/js/visualUI/commands/generic_expression.js
+  //TODO See ./ivprog/js/visualUI/commands/generic_expression.js : expressionParserCodeVisual(.) : missing treat to 'write_sep' in 'getVariable(.)' final command
+  // ATTENTION must pass all the vector to work with several variables in "write(.)"
+  var temp = CodeParser.expressionParserCodeVisual(command.content, function_obj); // provide HTML elements
+
+  //0 temp = CodeParser.expressionParserCodeVisual(command.content[0], function_obj);
+  //D console.log("./ivprog/js/util/codeParser.js: parseWriter(.): #temp=" + temp.length + "; type=" + temp.type + ": temp=" + JSON.stringify(temp));
+  return new Models.Writer(temp,command.newLine);
+  }
 
-  var temp = CodeParser.expressionParserCodeVisual(command.content[0], function_obj);
-
-  return new Models.Writer(
-    temp,
-    command.newLine
-  );
-}
 
 function parseBreak (command, function_obj) {
-    return new Models.Break();
-}
+  return new Models.Break();
+  }
 
-function parseAttribution (command, function_obj) {
 
+function parseAttribution (command, function_obj) {
   var variable = CodeParser.expressionParserCodeVisual(command.variable, function_obj);
   var expression = CodeParser.expressionParserCodeVisual(command.expression, function_obj);
 
   if (Array.isArray(variable)) 
     variable = variable[0];
 
-  return new Models.Attribution(
-    variable,
-    expression
-  );
-}
+  return new Models.Attribution(variable, expression);
+  }
+
 
+//TODO
 function parseComment (command, function_obj) {
-  // TODO
-  return new Models.Comment(
-    null
-  );
-}
+  return new Models.Comment(null);
+  }
 
-function parseFunctionCall (command, function_obj) {
 
+function parseFunctionCall (command, function_obj) {
   var parameters = [];
   if (command.parameters_list) {
     command.parameters_list.forEach(function(el) {
       var temp = CodeParser.expressionParserCodeVisual(el, function_obj);
       if (temp.content === 0) temp.content = "0";
       parameters.push(temp[0]);
-    });
-  }
+      });
+    }
 
   var function_called = CodeParser.searchFunction(command.name);
 
@@ -248,24 +229,20 @@ function parseFunctionCall (command, function_obj) {
   temp.function_called = function_called;
   temp.parameters_list = parameters;
   
-  return new Models.FunctionCall(
-    temp, 
-    null
-  );
-}
+  return new Models.FunctionCall(temp, null);
+  }
 
-function parseIfTrue(command, function_obj) {
 
+function parseIfTrue(command, function_obj) {
   var expression = CodeParser.expressionParserCodeVisual(command.expression, function_obj);
   var ifTrueBlock = parseCommands(command.ifTrue, function_obj);
   var ifFalseBlock = parseCommands(command.ifFalse, function_obj);
-
   return new Models.IfTrue(expression, ifTrueBlock, ifFalseBlock);
+  }
 
-}
-
-function parseRepeatNTimes(command, function_obj) {
 
+function parseRepeatNTimes (command, function_obj) {
+  console.log(".ivprog/js/util/codeParser.js: parseRepeatNTimes(.): command=" + JSON.stringify(command));
   var var_attribution = CodeParser.expressionParserCodeVisual(command.var_attribution, function_obj);
   var_attribution = var_attribution[0];
 
@@ -284,17 +261,9 @@ function parseRepeatNTimes(command, function_obj) {
 
   var commands_block = parseCommands(command.commands, function_obj);
 
-  var operator = command.step_expression[0].value == '+' 
-                  ? Models.ARITHMETIC_TYPES.plus
-                  : Models.ARITHMETIC_TYPES.minus;
+  var operator = command.step_expression[0].value == '+' ? Models.ARITHMETIC_TYPES.plus : Models.ARITHMETIC_TYPES.minus;
 
-  var expression3 = new Models.ExpressionElement(
-    Models.EXPRESSION_ELEMENTS.exp_op_exp, 
-    [ 
-      null,
-      operator, 
-      var_step[1]
-    ]);
+  var expression3 = new Models.ExpressionElement(Models.EXPRESSION_ELEMENTS.exp_op_exp, [ null, operator, var_step[1] ]);
 
   return new Models.RepeatNTimes(
     var_attribution,
@@ -303,49 +272,37 @@ function parseRepeatNTimes(command, function_obj) {
     expression2,
     expression3, 
     commands_block);
+  } // function parseRepeatNTimes(command, function_obj)
 
-}
 
 function parseWhileTrue (command, function_obj) {
-
   var expression = CodeParser.expressionParserCodeVisual(command.expression, function_obj);
   var commands = parseCommands(command.commands, function_obj);
 
-  return new Models.WhileTrue(
-    expression, 
-    commands
-  );
-}
+  return new Models.WhileTrue(expression, commands);
+  }
 
-function parseDoWhileTrue (command, function_obj) {
-  
+
+function parseDoWhileTrue (command, function_obj) {  
   var expression = CodeParser.expressionParserCodeVisual(command.expression, function_obj);
   var commands = parseCommands(command.commands, function_obj);
 
-  return new Models.DoWhileTrue(
-    expression, 
-    commands
-  );
-}
+  return new Models.DoWhileTrue(expression, commands);
+  }
 
-function parseSwitch (command, function_obj) {
 
+function parseSwitch (command, function_obj) {
   var expression = CodeParser.expressionParserCodeVisual(command.expression, function_obj);
 
   var sc = [];
   if (command.cases) {
     command.cases.forEach(function(case_el) {
-
       var temp_exp = CodeParser.expressionParserCodeVisual(case_el.expression, function_obj);
       var temp_commands = parseCommands(case_el.commands, function_obj);
       var temp_case = new Models.SwitchCase(temp_exp[0], temp_commands);
-
       sc.push(temp_case);
-    })
-  }
+      })
+    }
 
-	return new Models.Switch(
-    expression[0], 
-    sc
-  );
-}
+  return new Models.Switch(expression[0], sc);
+  }