src/rustint/core.clj

@@ -2084,7 +2084,7 @@
                   argval (second fetched),
                   next_cont_prg argval,
                   reg-act-to-add (get mapa-regs argval),
-                  retdir (inc cont-prg)
+                  retdir (inc argval)
                 ]
                 (recur cod (conj regs-de-act reg-act-to-add) next_cont_prg (conj pila retdir) mapa-regs)
           )
@@ -2124,20 +2124,16 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (defn flistar [ilevel t nxt]
-  (let [
-        preceding_space (clojure.string/join (repeat (* ilevel 2) " ")),
-        bracket_prec_space (clojure.string/join (repeat (* (- ilevel 1) 2) " "))
-      ]
   (cond
     (string? t) (format "\"%s\" " t)
-      (= t (symbol "{")) (format "\n%s{\n%s" bracket_prec_space preceding_space)
-      (= t (symbol "}")) (format "\n%s}" bracket_prec_space)
-      (= t (symbol ";")) (format ";\n%s" preceding_space)
+    (= t (symbol "{")) (clojure.string/join
+                         (cons "\n{\n" (repeat (* ilevel 2) " "))
+                      )
+    (= t (symbol "}")) "\n}"
     (and (not= nxt (symbol "{")) (not= nxt (symbol "}"))) (format "%s " t)
     :else (format "%s" t)
   )
 )
-)
 
 (defn listar [l]
   (let [contadores (hash-map (symbol "{") 1, (symbol "}") -1),

test/rustint/core_test.clj

@@ -957,14 +957,3 @@
     ))
   )
 )
-
-(deftest test-agregar-ptocoma-02
-  (testing "Test main 02 agregar-ptocoma"
-    (is (=
-      (agregar-ptocoma
-        (list 'fn 'main (symbol "(") (symbol ")") 'if 'x '< '0 (symbol "{") 'x '= '- 'x (symbol ";") 'x_cambio '= 'true (symbol ";") (symbol "}") 'print! (symbol "(") "y: " (symbol ")") (symbol ";") (symbol "}") )
-      )
-        (list 'fn 'main (symbol "(") (symbol ")") 'if 'x '< '0 (symbol "{") 'x '= '- 'x (symbol ";") 'x_cambio '= 'true (symbol ";") (symbol "}") (symbol ";") 'print! (symbol "(") "y: " (symbol ")") (symbol ";") (symbol "}") )
-    ))
-  )
-)