Merge pull request #16 from CarmenMarroquin/main

Issue 2 fixes

fases/fase3/parser/Templates.js

@@ -15,7 +15,7 @@ export const main = (data) => `
 module parser
   implicit none
   character(len=:), allocatable, private :: input
-  integer, private :: savePoint, lexemeStart, cursor
+  integer, private :: lexemeStart, cursor
 
   interface toStr
       module procedure intToStr
@@ -254,6 +254,7 @@ export const rule = (data) => `
       integer :: count, min_reps, max_reps, tempi
       integer :: i
       logical :: pivote
+      integer :: savePoint
 
       savePoint = cursor
       ${data.expr}
@@ -266,6 +267,7 @@ export const rule = (data) => `
       integer :: count, min_reps, max_reps
       integer :: i, tempi
       logical :: pivote
+      integer :: savePoint
 
       savePoint = cursor
        ${data.expr.replace(/if\(\.not\./g, "if(")}
@@ -278,6 +280,7 @@ export const rule = (data) => `
       integer :: count, min_reps, max_reps, tempi
       integer :: i
       logical :: pivote
+      integer :: savePoint
 
       savePoint = cursor
       ${getReplaceKleene(data)}
@@ -308,7 +311,7 @@ function getReplaceKleene(data) {
 * @returns
 */
 export const election = (data) => `
-      do i = 0, ${data.exprs.length-1}
+      do i = 0, ${data.exprs.length}
           select case(i)
           ${data.exprs
             .map(

fases/fase3/parser/compiler/Translator.js

@@ -65,15 +65,17 @@ export default class FortranTranslator {
    */
   visitRegla(node) {
 
-    console.log("\nVisit Regla: ")
+    console.log("\n-----------------------\n|     Visit Regla     |\n-----------------------")
     console.dir(node)
+    console.dir(node.expr.exprs)
     console.dir(this.actionReturnTypes)
     this.currentRule = node.id;
     this.currentChoice = 0;
     this.conteoAccion = 0;
 
     if (node.start) this.translatingStart = true;
 
+
     const ruleTranslation = Template.rule({
       id: node.id,
       returnType: getReturnType(
@@ -85,10 +87,9 @@ export default class FortranTranslator {
           .filter((expr) => expr instanceof CST.Pluck)
           .map((label, j) => {
             const expr = label.labeledExpr.annotatedExpr.expr;
-            console.log(election)
             return `${
               expr instanceof CST.Identificador
-                ? getReturnType(getActionId(expr.id, election.action ? i : 0), this.actionReturnTypes)
+                ? getReturnType(getActionId(expr.id, 0), this.actionReturnTypes)
                 : "character(len=:), allocatable"
             } :: expr_${i}_${j}`;
           })
@@ -107,7 +108,7 @@ export default class FortranTranslator {
    * @this {Visitor}
    */
   visitOpciones(node) {
-    console.log("\Visit Opciones: ") // <3
+    console.log("\nVisit Opciones: ") // <3
     console.dir(node)
     return Template.election({
       exprs: node.exprs.map((expr) => {
@@ -123,7 +124,7 @@ export default class FortranTranslator {
    * @this {Visitor}
    */
   visitUnion(node) {
-    console.log("\nVisit Union: ") // <3
+    console.log("\n-----------------------\n|     Visit Union     |\n-----------------------")
     console.dir(node)
     const matchExprs = node.exprs.filter((expr) => expr instanceof CST.Pluck);
     console.log(`\tMatchExprs:`)
@@ -701,7 +702,7 @@ export default class FortranTranslator {
       paramDeclarations: Object.entries(node.params).map(
         ([label, ruleId]) =>
           `${getReturnType(
-            getActionId(ruleId, this.currentChoice),
+            getActionId(ruleId, 0),
             this.actionReturnTypes
           )} :: ${label}`
       ),

test/test1/exec

@@ -1,4 +1,4 @@
-gfortran -c parser.f90
-gfortran -c test.f90
-gfortran parser.o test.o -o test
+gfortran -g -c parser.f90
+gfortran -g -c test.f90
+gfortran -g parser.o test.o -o test
 ./test input.txt

test/test1/input.txt

@@ -1 +1 @@
-2 + 2 * 3
+2+3*4+5*6