Merge pull request #2 from Federico-G/fede

v1.0.0-alpha2

Author: Federico-G

TODO.md

@@ -0,0 +1,24 @@
+# TODO
+
+## Current
+
+### Contenido
+- Usar el espacio de carga para mostrar datos curiosos (estatico, porque freezea js el procesamiento (la carga no))
+- Agregar contenido a informacion (nosotros) y a ayuda (en lo posible contenido multimedia)
+- Link a screen diagrama en screen info de alguna manera
+- Meta: description
+- Intentar nuevamente con Google Ads una vez finalizadas las tareas anteriores de **contenido** (https://www.google.com/adsense/)
+
+### Bugs
+- AWAIT
+- [low] Versión visible en barra en mobile
+
+## V 1.1
+- Personalizar nombres al exportar archivos
+- Altura del lienzo cambiable según la posición del último elemento (hay que tener en consideración el scale)
+- pushState para tomar atrás y adelante del history
+
+## Request features
+- Archivos
+- Vectores y matrices
+- Guardar online para compartir (ya que pwa no soporta abrir cierto tipo de extensiones aun)

public/css/main.css

@@ -22,6 +22,16 @@ body {
   background-color: var(--secondary-color);
 }
 
+.main-text-color {
+  color: var(--main-color) !important;
+  font-weight: bold;
+}
+
+.sql-text-color {
+  color: var(--secondary-color) !important;
+  font-weight: bold;
+}
+
 #version {
   font-size: 10px;
   color: #DCB;
@@ -64,10 +74,12 @@ footer a:hover {
 /* INFO */
 
 #intro {
-  padding: 25px;
+  margin-top: 25px;
+  margin-bottom: 25px;
+  padding-right: 25px;
+  padding-left: 25px;
   font-size: 28px;
   position: absolute;
-  padding: 25px;
   /*height: 100%;*/
   width: 100%;
   display: flex;

public/dict.txt

@@ -1,7 +1,10 @@
 background
+shape-dowhile
+shape-for
+shape-if
 shape-in
 shape-while
 shape-op
 shape-end
 shape-out
-shape-start
+shape-start

public/group1-shard1of2.bin

@@ -61,6 +61,9 @@
 						<li class="nav-item">
 							<a class="nav-link" href="#" onclick="dg.step.screenFunctions(); $('.navbar-collapse').collapse('hide'); return false;">Funciones</a>
 						</li>
+						<li class="nav-item">
+							<a class="nav-link sql-text-color" href="/sql.html">SQL</a>
+						</li>
 						<li class="nav-item" style="display: none;">
 							<a class="nav-link" href="#" id="instalar"><i class='fa fa-mobile'></i> <span>Instalar</span></a>
 						</li>
@@ -100,6 +103,7 @@ <h5 class="modal-title" id="symbol-table-label">Tabla de símbolos</h5>
 
 	<!-- vendor -->
 	<script src='js/jquery.min.js'></script>
+	<script src='js/lodash.min.js'></script>
 	<script src='js/bootstrap.bundle.min.js'></script>
 	<script src='js/interact.min.js'></script>
 	<script src='js/compressor.min.js'></script>

public/group1-shard1of5.bin

@@ -11,6 +11,7 @@ dg.code.SymbolTable.prototype.addSymbol = function(name, symbol) {
 
 dg.code.SymbolTable.prototype.clone = function() {
 	var st = new dg.code.SymbolTable;
-	st.table = $.extend(true, {}, this.table);
+	// st.table = $.extend(true, {}, this.table);
+	st.table = _.cloneDeep(this.table);
 	return st;
 }

public/group1-shard2of2.bin

@@ -29,8 +29,7 @@ dg.code.Tree.prototype.prevStep = function() {
 		var step = this.history.pop();
 		this.currentSymbolTable = step.getSymbolTable();
 		this.currentConsole = step.getConsole();
-		this.currentNode = step.getNode();
-		return this.history.length ? this.history[this.history.length - 1].getNode() : null;
+		return this.currentNode = step.getNode();
 	}
 	return null;
 }

public/group1-shard2of5.bin

@@ -149,9 +149,9 @@ var grammar = {
     {"name": "postfixExpression", "symbols": ["postfixExpression", "_", {"literal":"("}, "_", "expression", "_", {"literal":")"}], "postprocess": d => ({identifiers: bnf_join_id(d[0], d[4]) })},
     {"name": "postfixExpression", "symbols": ["postfixExpression", "_", {"literal":"("}, "_", {"literal":")"}], "postprocess": d => d[0]},
     {"name": "postfixExpression$string$1", "symbols": [{"literal":"+"}, {"literal":"+"}], "postprocess": function joiner(d) {return d.join('');}},
-    {"name": "postfixExpression", "symbols": ["identifier", "_", "postfixExpression$string$1"], "postprocess": d => d[0]},
+    {"name": "postfixExpression", "symbols": ["identifier", "_", "postfixExpression$string$1"], "postprocess": d => ({identifiers: [d[0]]})},
     {"name": "postfixExpression$string$2", "symbols": [{"literal":"-"}, {"literal":"-"}], "postprocess": function joiner(d) {return d.join('');}},
-    {"name": "postfixExpression", "symbols": ["identifier", "_", "postfixExpression$string$2"], "postprocess": d => d[0]},
+    {"name": "postfixExpression", "symbols": ["identifier", "_", "postfixExpression$string$2"], "postprocess": d => ({identifiers: [d[0]]})},
     {"name": "primaryExpression", "symbols": ["identifier"], "postprocess": d => ({identifiers: [d[0]]})},
     {"name": "primaryExpression", "symbols": ["constant"]},
     {"name": "primaryExpression", "symbols": ["stringLiteral"]},

public/group1-shard3of5.bin

@@ -179,8 +179,8 @@ postfixExpression-> primaryExpression                               {% d => d[0]
     | postfixExpression _ "[" _ expression _ "]"                    {% d => ({identifiers: bnf_join_id(d[0], d[4]) }) %}
     | postfixExpression _ "(" _ expression _ ")"                    {% d => ({identifiers: bnf_join_id(d[0], d[4]) }) %}
     | postfixExpression _ "(" _ ")"                                 {% d => d[0] %}
-    | identifier _ "++"                                             {% d => d[0] %}
-    | identifier _ "--"                                             {% d => d[0] %}
+    | identifier _ "++"                                             {% d => ({identifiers: [d[0]]}) %}
+    | identifier _ "--"                                             {% d => ({identifiers: [d[0]]}) %}
 
 primaryExpression -> identifier                                     {% d => ({identifiers: [d[0]]}) %}
     | constant

public/group1-shard4of5.bin

@@ -62,7 +62,7 @@ dg.language.CodeToLanguage = function(elements, functions) {
 					}
 				}
 
-				return ["printf(\"" + retornar + "\"" + (extras.length > 1 ? extras.join(", ") : "") + ");"];
+				return ["printf(\"" + retornar + "\\n\"" + (extras.length > 1 ? extras.join(", ") : "") + ");"];
 
 			case "WHILE":
 				parser_result = _parse(stype, content);
@@ -74,7 +74,7 @@ dg.language.CodeToLanguage = function(elements, functions) {
 
 			case "DOWHILE":
 				parser_result = _parse(stype, content);
-				return ["do\n", "while (" + content + ");\n"];
+				return ["do", "while (" + content + ");\n"];
 
 			case "IF":
 				parser_result = _parse(stype, content);