Changeset 1835

Timestamp:

Jan 24, 2006, 10:24:24 AM (15 years ago)

Author:

orlov

Message:

• Various improvements. Now any ASAIL program should compile to Java.

Location:

to-imperative/trunk/compiler

Files:

• rfp_asail_cpp.rf (modified) (1 diff)
• rfp_asail_java.rf (modified) (2 diffs)
• rfp_asail_optim.rf (modified) (1 diff)
• rfp_compile.rf (modified) (1 diff)
• rfp_lex.rf (modified) (1 diff)

to-imperative/trunk/compiler/rfp_asail_cpp.rf

@@ -87 +87 @@
 ASAIL-To-CPP e.asail, {
   e.asail : t.item e.rest, t.item : {
-    (FUNC t.name (e.args) (e.ress) e.body) =
+    (s.tag t.name (e.args) (e.ress) e.body),
+      s.tag : \{
+        FUNC  = ('void') /*empty*/;
+        FUNC? = ('boolean') ('return true;');
+      } :: (e.return-type) e.return =
       <Store &Current-Func t.name>,
       { <? &Entry> : t.name = <Store &Entry-Name <Rfp2Cpp t.name>>;; },

to-imperative/trunk/compiler/rfp_asail_java.rf

@@ -223 +223 @@
       };
   } :: e.java-item,
-    e.java-item <ASAIL-To-Java e.rest>;
+    {
+      e.java-item : ('break ' e) = e.java-item;
+      e.java-item <ASAIL-To-Java e.rest>;
+    };
   /*empty*/;
 };
@@ -416 +419 @@
     (STATIC e) =
       () (<Rfp2Java t.item>);
+    (FUNC t.name) = () ('new Expr (new Func () {'
+      ('public boolean eval (Expr arg, Expr res) throws RefalException {'
+        ('return '<Name-To-Java t.name>' (arg, res);')
+      '}') '})');
 //    (FUNC t.name) =
 //      '.concat (new Expr (new Reference ("'<Name-To-JAVA t.name>'")));

to-imperative/trunk/compiler/rfp_asail_optim.rf

@@ -662 +662 @@
   /*empty*/ = /*empty*/;
   (LABEL e.block) e.tail = (LABEL e.block) e.tail;
-  t.head e.tail = <Unachiev-Del e.tail>;
+  t.head e.tail = t.head <Unachiev-Del e.tail>;
 };
   

to-imperative/trunk/compiler/rfp_compile.rf

@@ -747 +747 @@
     e1 = e1 '_' 0;
   } :: e.name,
-  (e.qualifiers <To-Word e.name>) :: t.name,
+  (/*e.qualifiers*/ <To-Word e.name>) :: t.name,
   {
     <Lookup-Func t.name> : e = <Stub-Name t.name>;

to-imperative/trunk/compiler/rfp_lex.rf

@@ -80 +80 @@
   <Store &Src-Counter 0>,
   <RFP-Clear-Table &RFP-Sources>,
+  <RFP-Clear-Table &RFP-Includes>,
   {
     e.filename : v, {