Changeset 220

Timestamp:

Nov 2, 2002, 11:43:08 PM (18 years ago)

Author:

orlov

Message:

* empty log message *

Location:

to-imperative/branches/pragma/compiler

Files:

• rfp_asail.rf (modified) (11 diffs)
• rfp_asail.rfi (modified) (1 diff)
• rfpc.rf (modified) (1 diff)

to-imperative/branches/pragma/compiler/rfp_asail.rf

@@ -4 +4 @@
 
 $use Apply Box Class Convert StdIO Table;
+$use "rfpc";
 $use "rfp_helper";
 
-// Constructs legal C++ name from e.Name and stores it in the &RFP-CPP-Names table
+$box Func-Names;
+$table Func-Table;
+$box Var-Names;
+$table Var-Table;
+
+$func ASAIL-To-CPP e.body = e.cpp-code;
+
+// Constructs legal C++ name from e.Name and stores it in the appropriate box
+// and table
 $func Name-To-CPP t.Name = e.legal-cpp-name;
 
@@ -39 +48 @@
 $func Op-Arg-To-CPP s.op = s.func-for-converting-args-to-cpp;
 
-RFP-ASAIL-To-CPP e.asail, {
+RFP-ASAIL-To-CPP e.asail =
+  <Store &Func-Names /*empty*/>,
+  <RFP-Clear-Table &Func-Table>,
+  <ASAIL-To-CPP e.asail>;
+
+ASAIL-To-CPP e.asail, {
   e.asail : t.item e.rest, t.item : {
     (FUNC t.name (e.args) (e.ress) e.body) =
-//      {
-//        /*
-//         * Insert an empty line between functions.
-//         */
-//        e.rest : v = ();
-//        /*empty*/;
-//      } :: e.space,
+      <Store &Var-Names /*empty*/>,
+      <RFP-Clear-Table &Var-Table>,
       ('RF_FUNC (' <Name-To-CPP t.name> ', '
         '(' <Args-To-CPP ('RF_ARG ') Vars e.args> '), '
         '(' <Args-To-CPP ('RF_RES ') Vars e.ress> '))'
-          (<RFP-ASAIL-To-CPP e.body>)
+          (<ASAIL-To-CPP e.body>)
        'RF_END');
     (IF (e.cond) e.body) =
       ('if (' <Cond-To-CPP e.cond> ')')
-      ('{' (<RFP-ASAIL-To-CPP e.body>) '}');
+      ('{' (<ASAIL-To-CPP e.body>) '}');
     (FOR (e.label) (e.cond) (e.step) e.body) =
       {
@@ -62 +71 @@
       } :: e.label,
       ('for ( ; ' <Cond-To-CPP e.cond> '; ' <Step-To-CPP e.step> ')')
-      ('{' (<RFP-ASAIL-To-CPP e.body>) e.label '}');
+      ('{' (<ASAIL-To-CPP e.body>) e.label '}');
     (LABEL t.label e.body) =
-      ('{' (<RFP-ASAIL-To-CPP e.body>) '}')
+      ('{' (<ASAIL-To-CPP e.body>) '}')
       (LABEL <Name-To-CPP (LABEL t.label)> ': {}');
     (TRY e.body) =
-      ('try {' (<RFP-ASAIL-To-CPP e.body>) '}');
+      ('try {' (<ASAIL-To-CPP e.body>) '}');
     (CATCH-ERROR e.body) =
-      ('with {' (<RFP-ASAIL-To-CPP e.body>) '}');
+      ('with {' (<ASAIL-To-CPP e.body>) '}');
     RETURN = ('return true;');
     RETFAIL = ('retfail;');
@@ -111 +120 @@
       '(' <Args-To-CPP () Exprs e.exprs> '), (' <Args-To-CPP () Vars e.ress> '));');
   } :: e.cpp-item,
-    e.cpp-item <RFP-ASAIL-To-CPP e.rest>;
+    e.cpp-item <ASAIL-To-CPP e.rest>;
   /*empty*/;
 };
@@ -144 +153 @@
     t.item : {
       s.ObjectSymbol = <Symbol-To-CPP s.ObjectSymbol>;
-      (PAREN e.expr) = '(' <Expr-Ref-To-CPP 0 e.expr> ') ()';
+      (PAREN e.expr) = <Expr-Ref-To-CPP 0 e.expr> ' ()';
       (EXPR e.expr) =
         'Expr (' <Chars-To-CPP e.expr> ')';
@@ -177 +186 @@
         };
       (LENGTH e.expr) =
-        '(int) (' <Expr-Ref-To-CPP 0 e.expr> ').get_len ()';
+        '(int) ' <Expr-Ref-To-CPP 0 e.expr> '.get_len ()';
       (MAX e.args) =
         'max (' <Args-To-CPP () Ints e.args> ')';
@@ -204 +213 @@
         '(' <Args-To-CPP () Vars e.ress> '))';
       (SYMBOL? e.expr (e.pos)) =
-        '(' <Expr-Ref-To-CPP 0 e.expr> ').symbol_at (' <Expr-Int-To-CPP e.pos> ')';
+         <Expr-Ref-To-CPP 0 e.expr> '.symbol_at (' <Expr-Int-To-CPP e.pos> ')';
       (FLAT-SUBEXPR? e.expr (e.pos) (e.len)) =
-        '(' <Expr-Ref-To-CPP 0 e.expr> ').flat_at ('
+         <Expr-Ref-To-CPP 0 e.expr> '.flat_at ('
           <Expr-Int-To-CPP e.pos> ', ' <Expr-Int-To-CPP e.len> ')';
       /*
@@ -224 +233 @@
               <Expr-Int-To-CPP e.len> ')'; 
       (NOT e.cond) =
-        '!(' <Cond-To-CPP e.cond> ')';
+        '!' <Cond-To-CPP e.cond>;
       (INFIX s.op e.args) =
         '(' <Infix-To-CPP <Op-Arg-To-CPP s.op> s.op e.args> ')';
@@ -237 +246 @@
       /*empty*/;
     } :: e.cpp-op,
-    '(' <Apply s.arg2cpp e.arg> ')' e.cpp-op <Infix-To-CPP s.arg2cpp s.op e.rest>;;
+    <Apply s.arg2cpp e.arg> e.cpp-op <Infix-To-CPP s.arg2cpp s.op e.rest>;;
 };
 
@@ -278 +287 @@
 };
 
-$box Used-Names;
-
 /*
  * Gets function name or variable and returns legal C++ name corresponding to
  * it. If is called with such parameter at the first time then stores C++ name
- * in the &RFP-CPP-Names table for further using.
+ * in the appropriate table for further using. Also put new name in the
+ * appropriate box. Box and table for variables is updated for each new
+ * function and box and table for functions is updated for each new module.
  */
 Name-To-CPP term =
   term : {
-    (VAR (e.QualifiedName)) = e.QualifiedName;
-    (LABEL (e.QualifiedName)) = e.QualifiedName;
-    (e.QualifiedName) = e.QualifiedName;  // function name
-  } :: e.QualifiedName,
+    (VAR (e.QualifiedName)) = e.QualifiedName &Var-Names &Var-Table;
+    (LABEL (e.QualifiedName)) = e.QualifiedName &Var-Names &Var-Table;
+    (e.QualifiedName) = e.QualifiedName &Func-Names &Func-Table;  // function name
+  } :: e.QualifiedName s.used-names s.table,
   {
-    <Lookup &RFP-CPP-Names e.QualifiedName>;
+    <Lookup s.table e.QualifiedName>;
     e.QualifiedName : s.first e.last,
       <Word-To-CPP-Chars s.first> :: e.first,
@@ -302 +311 @@
       } :: (e.first) e.last,
       e.first <Build-CPP-Name e.last> :: e.name,
-      <Find-Unused-Name (<? &Used-Names>) e.name> :: e.name,
-      <Put &Used-Names (e.name)>,
-      <Bind &RFP-CPP-Names (e.QualifiedName) (e.name)>,
+      <Find-Unused-Name (<? s.used-names>) e.name> :: e.name,
+      <Put s.used-names (e.name)>,
+      <Bind s.table (e.QualifiedName) (e.name)>,
       e.name;
   };

to-imperative/branches/pragma/compiler/rfp_asail.rfi

@@ -3 +3 @@
 // $Date$
 
-/*
- * Table for storing legal C++ names of functions and variables. Only functions
- * names will appear in result program as are. For variables they are obtained
- * from indexes and to be preceded by some prefix. For e.Key e.QualifiedName is
- * used.
- */
-$table RFP-CPP-Names;
-
 $func RFP-ASAIL-To-CPP e.asail = e.cpp;
 

to-imperative/branches/pragma/compiler/rfpc.rf

@@ -132 +132 @@
           <Channel> :: s.channel,
           <Open-File s.channel e.file R>,
-          AS-AIL <Read! s.channel>;
+          AS-AIL (AS-AIL AS-AIL <Read! s.channel> <Read! s.channel>);
         <PrintLN! &StdErr "Error: unknown extension" e.ext " in " e.file> = $fail;
       } : s.type (s.tag t.ModuleName e.Items),