Changeset 1831

Timestamp:

Jan 19, 2006, 4:32:54 AM (15 years ago)

Author:

orlov

Message:

• Fixed generation of Java constant expressions.
• Improved Java output formatting.

Location:

to-imperative/trunk/compiler

Files:

• rfp_asail_java.rf (modified) (8 diffs)
• rfpc.rf (modified) (3 diffs)

to-imperative/trunk/compiler/rfp_asail_java.rf

@@ -64 +64 @@
 
 RFP-ASAIL-To-Java (e.ModuleName) (e.exports) e.asail =
+  <Store &Free-Idx>,
   <RFP-Clear-Table &Iter-Vars>,
   {
@@ -77 +78 @@
       { 
         <? &Entry-Name> : v.name =
-          ('public static void main(java.lang.String[] args) {'
+          ()
+          ('public static void main (java.lang.String[] args) {'
             (('try {' (v.name' (new Expr ());') '}')
              ('catch (RefalException e) {' ('System.out.println ("$error: " + e);') '}')
@@ -85 +87 @@
       <Store &Module-Name <Rfp2Java e.ModuleName>>,
       (<Domain &Inputs>)
-      ('public class '<? &Module-Name>' {'
+      ('public class '<? &Module-Name>'\n{'
         (v.java e.entry)
        '}');
@@ -98 +100 @@
         FUNC? = ('boolean') ('return true;');
       } :: (e.return-type) e.return =
-      <Store &Free-Idx>,
       <Store &Return-Type e.return-type>,
       <Store &Ress e.ress>,
@@ -104 +105 @@
 //      <RFP-Extract-Qualifiers t.name> :: (e.qualifiers) e.n,
       <Store &Func-Name <Name-To-Java t.name>>,
+      ()
       ('static '<Access-Mode t.name>' 'e.return-type' '
         <? &Func-Name>' ('<Var-Args-To-Java e.args e.ress>') throws RefalException')
@@ -161 +163 @@
       {
         <? &Ress> : e t.var e =
-          e.a (<Rfp2Java t.var>'.assign('e.j-expr');');
+          e.a (<Rfp2Java t.var>'.assign ('e.j-expr');');
         e.a (<Rfp2Java t.var>' = 'e.j-expr';');
       };
@@ -380 +382 @@
 };
 
-$func Const-Expr-Aux e.expr = (e.arrays) e.java-expr;
+$func Const-Expr-Aux (e.accum) e.expr = (e.arrays) e.java-expr;
 
 Const-Expr-To-Java {
@@ -392 +394 @@
       (e.arrays) (e1)      = e.arrays (e1);
       (e.arrays) (e1) (e2) = e.arrays ('new Expr ('e1', 'e2')');
+      (e.arrays) e.concat  =
+        '_va_'<Free-Index> :: e.new-var,
+        e.arrays 
+        ('static private final Expr[] 'e.new-var' = { '<Concat <Intersperse (', ') e.concat>>' };')
+        ('Expr.concat ('e.new-var')');
     };
 };

to-imperative/trunk/compiler/rfpc.rf

@@ -137 +137 @@
       {
         e.ext : \{ ' .rf'; ' .rfi'; } =
-          <Verbose "parsing started" >,
+          <Verbose e.filename ": parsing started" >,
           <RFP-Lexer e.file> :: e.tokens,
           <Store &RFP-Token-Stack e.tokens>,
           <RFP-Parser> :: t.as,
-          <Verbose "parsing finished">,
+          <Verbose e.filename ": parsing finished">,
           AS-REFAL t.as;
         e.ext : ' .asr' =
@@ -314 +314 @@
               {
                 e.inputs : e (e.java-module) e,
-                  <Lookup &RFP-Includes <To-Chars e.java-module>> : {
+                  <Lookup &RFP-Includes <To-Chars e.java-module>> : \{
                     BOOT e = 'org.refal.plus.library.'e.java-module;
-                    LOCAL e.path =
-                      <Subst (&RFP-Dir-Separator) (('.')) e.path> e.java-module;
-                } :: e.java-module,
+//                    LOCAL e.path =
+//                      {
+//                        e.path : '.' &RFP-Dir-Separator e.rest-path = e.rest-path;
+//                        e.path;
+//                      } :: e.path,
+//                      <Subst (&RFP-Dir-Separator) (('.')) e.path> e.java-module;
+                  } :: e.java-module,
                   <PrintLN! s.channel 'import 'e.java-module';'>,
                   $fail;;
@@ -548 +552 @@
           e.indent : e.ind &Tab,
           <PrintLN! s.channel e.ind e.label>;
+        e1 : /*empty*/ =
+          <PrintLN! s.channel>;
         <CPP-Pretty-Print 1 s.channel (e.indent) e1>;
       };