Changeset 2068

Timestamp:

Aug 24, 2006, 9:27:57 PM (14 years ago)

Author:

orlov

Message:

• Again dancing around variables naming in as2as and asail2asail.
• Fixed references to functions from $const-ants.
• New rfp_lex.Find-Includes function (used in rfpj).
• Parse all blocks as RESULTs (well, this part isn't really done yet --

resulting ASR isn't always compilable).

• While generating Java: package name is computed from -I options.
• In Java do exit(100) when uncaught $error comes (TODO the same in C++).
• Uses of Repeat function are changed to List.Replicate.
• Some other functions are gone from rfp_helper (Abs, Max, Min, L-, R-...).

Location:

to-imperative/trunk/compiler

Files:

• rfp_as2as.rf (modified) (5 diffs)
• rfp_asail2asail.rf (modified) (4 diffs)
• rfp_asail_java.rf (modified) (1 diff)
• rfp_check.rf (modified) (2 diffs)
• rfp_clashes.rf (modified) (1 diff)
• rfp_compile.rf (modified) (3 diffs)
• rfp_format.rf (modified) (2 diffs)
• rfp_helper.rf (modified) (3 diffs)
• rfp_helper.rfi (modified) (2 diffs)
• rfp_lex.rf (modified) (3 diffs)
• rfp_lex.rfi (modified) (1 diff)
• rfp_parse.rf (modified) (3 diffs)
• rfpc.rf (modified) (5 diffs)

to-imperative/trunk/compiler/rfp_as2as.rf

@@ -19 +19 @@
 
 // remove blocks from Re
-$func Flatten-Result (e.Re) e.items = e.assigns (e.Re);
+$func Flatten-Result s.tail? (e.Re) e.items = e.assigns (e.Re);
 
 $func Generate-In-Vars (e.in) e.branch = (e.in) e.branch;
@@ -90 +90 @@
       e.branches : (BRANCH t.p e.branch) e.rest,
         <Unstick-Blocks e.branch> :: e.new-branch (e.Fe),
-        { e.Fe : FAIL; (e.Fe); } :: e.Fe,
-        e.rest (e.br (BRANCH t.p e.new-branch)) (e.Fes e.Fe);
+        e.rest (e.br (BRANCH t.p e.new-branch)) (e.Fes (e.Fe));
     } :: e.branches (e.br) (e.Fes),
     e.branches : /*empty*/ =
@@ -103 +102 @@
         (RIGHT e) e;
       } =
-        <Gener-Var-Indices 1 (<MSG e.Fes>) "aux" "block"> :: e.aux s,
+        <? &Free-Idx> : s.N,
+        <Gener-Var-Indices s.N (<MSG e.Fes>) "aux" "alt"> :: e.aux s.N,
+        <Store &Free-Idx s.N>,
         eL (s.block t.Pragma e.br) (FORMAT (PRAGMA) e.aux)
         (RESULT (PRAGMA) e.aux) <Unstick-Blocks eR>;
@@ -110 +111 @@
       eL (s.block t.Pragma e.br) <Unstick-Blocks eR>;
     };
+  (RESULT t.Pragma (s.block e.branches)) eR, s.block : \{ BLOCK; BLOCK?; } =     // FIXME: Comment this and search for BUGs!
+    eL <Unstick-Blocks (s.block e.branches) eR>;
   (RESULT t.Pragma e.Re) eR =
-    <Flatten-Result () e.Re> :: e.assigns (e.Re),
+    <Flatten-Result Tail () e.Re> :: e.assigns (e.Re),
+    {
+      e.Re : e1 (FAIL e2) = (RESULT t.Pragma e1) e2;
+      (RESULT t.Pragma e.Re);
+    } :: e.Result,
     {
       eR : v =
-        eL e.assigns (RESULT t.Pragma e.Re) <Unstick-Blocks eR>;
-      eL e.assigns (RESULT t.Pragma e.Re) (<Format-Exp e.Re>);
+        eL e.assigns e.Result <Unstick-Blocks eR>;
+      <Format-Exp e.Re> :: e.Fe,
+        <MSG (e.Fe) (e.Fe)> :: e.Fe,  // hack for avoiding non-hard formats
+        eL e.assigns e.Result (e.Fe);
     };
   (NOT (BRANCH t.p1 e.body)) eR =
@@ -128 +137 @@
     <Unstick-Blocks t.CatchBlock> :: e.CatchBlock t.Catch-Fe,
     eL (TRY (BRANCH t.p1 e.TrySnt) e.NOFAIL e.CatchBlock) (<MSG t.Try-Fe t.Catch-Fe>);
-  (FAIL e) = e.Sentence (FAIL);
+  (FAIL e) = e.Sentence ((FAIL));
   (ERROR t.Pragma) eR =
     <Unstick-Blocks eR> :: eR t,
-    eL (ERROR t.Pragma) eR (FAIL);
+    eL (ERROR t.Pragma) eR ((FAIL));
 };
 
-Flatten-Result (e.Re) e.items, e.items : {
+Flatten-Result s.tail? (e.Re) e.items, e.items : {
   t1 e.rest, t1 : \{ (BLOCK e); (BLOCK? e); } =
-    <Format-Exp e.Re> :: e.Fe,
-    <MSG (e.Fe) (e.Fe)> :: e.Fe,  // hack for avoiding non-hard formats
-    <? &Free-Idx> : s.N,
-    <Gener-Var-Indices s.N (e.Fe) "aux" "result"> :: e.aux1 s.N,
-    <Store &Free-Idx s.N>,
     <Unstick-Blocks t1> :: e1 (e.Format),
-    <? &Free-Idx> : s.N2,
-    <Gener-Var-Indices s.N2 (e.Format) "aux" "block"> :: e.aux2 s.N2,
-    <Store &Free-Idx s.N2>,
-    (RESULT (PRAGMA) e.Re) (FORMAT (PRAGMA) e.aux1)
-    e1 (FORMAT (PRAGMA) e.aux2)
-    <Flatten-Result (e.aux1 e.aux2) e.rest>;
+    {
+      e.Format : (FAIL) =
+        (e.Re (FAIL e1));
+      <? &Free-Idx> : s.N,
+        <Gener-Var-Indices s.N (e.Format) "aux" "block"> :: e.aux s.N,
+        <Store &Free-Idx s.N>,
+        e1 (FORMAT (PRAGMA) e.aux)
+        <Flatten-Result s.tail? (e.Re e.aux) e.rest>;
+    };
   (CALL t.p t.name e.r) e.rest =
-    <Flatten-Result () e.r> :: e.assigns (e.r),
+    <Flatten-Result Not-Tail () e.r> :: e.assigns (e.r),
+    (CALL t.p t.name e.r) :: t1,
     {
-      e.assigns : v =
-        <Format-Exp e.Re> :: e.Fe,
-        <MSG (e.Fe) (e.Fe)> :: e.Fe,  // hack for avoiding non-hard formats
-        <? &Free-Idx> : s.N,
-        <Gener-Var-Indices s.N (e.Fe) "aux" "result"> :: e.aux1 s.N,
+      e.rest : /*empty*/, s.tail? : Tail =
+        e.assigns (e.Re t1);
+      <? &Free-Idx> : s.N,
+        <Gener-Var-Indices s.N (<Format-Exp t1>) "aux" "call"> :: e.aux1 s.N,
         <Store &Free-Idx s.N>,
-        (RESULT (PRAGMA) e.Re) (FORMAT (PRAGMA) e.aux1)
-        e.assigns <Flatten-Result (e.aux1 (CALL t.p t.name e.r)) e.rest>;
-      <Flatten-Result (e.Re (CALL t.p t.name e.r)) e.rest>;
+        e.assigns (RESULT (PRAGMA) t1) (FORMAT (PRAGMA) e.aux1)
+        <Flatten-Result s.tail? (e.Re e.aux1) e.rest>;
     };
   (PAREN e.r) e.rest =
-    <Flatten-Result () e.r> :: e.assigns (e.r),
-    e.assigns <Flatten-Result (e.Re (PAREN e.r)) e.rest>;
-  t1 e.rest = <Flatten-Result (e.Re t1) e.rest>;
+    <Flatten-Result Not-Tail () e.r> :: e.assigns (e.r),
+    e.assigns <Flatten-Result s.tail? (e.Re (PAREN e.r)) e.rest>;
+  t1 e.rest = <Flatten-Result s.tail? (e.Re t1) e.rest>;
   /*empty*/ = (e.Re);
 };

to-imperative/trunk/compiler/rfp_asail2asail.rf

@@ -13 +13 @@
 $func Remove-Dupl-Decl (e.decls) (e.subst) e.asail = e.asail;
 
+$func Process-Var (e.decls) (e.subst) s.type t.var = e.maybe-decl (e.decls) (e.subst);
+
 $func Free-Idx = s.idx;
 
+$box Idx;
+
 
 Simplify-ASAIL e.asail =
+  <Store &Idx>,
   <Remove-Dupl-Decl () () <Remove-Unreachable <Simplify e.asail>>>;
 
@@ -125 +130 @@
 Remove-Dupl-Decl (e.decls) (e.subst) e.items, e.items : {
   t1 e.rest = {
-    t1 : (DECL s.type t.var) = {
-      e.decls : $r e (DECL s.type-old t.var) e = {
-        s.type : s.type-old = <Remove-Dupl-Decl (e.decls) (e.subst) e.rest>;
-        t.var : (s.tag e (e.name)),
-          (s.tag 'dd' (e.name <Free-Idx>)) :: t.new-var,
-          (DECL s.type t.new-var) :: t.new-decl,
-          t.new-decl <Remove-Dupl-Decl (e.decls t.new-decl) (e.subst (t.var t.new-var)) e.rest>;
-      };
-      t1 <Remove-Dupl-Decl (e.decls t1) (e.subst) e.rest>;
-    };
-    t1 : (EXPR t.var e.expr) = {
-      e.decls : $r e (DECL s.type-old t.var) e = {
-        s.type-old : Expr =
-          (ASSIGN t.var <Remove-Dupl-Decl (e.decls) (e.subst) e.expr>)
-          <Remove-Dupl-Decl (e.decls) (e.subst) e.rest>;
-        t.var : (s.tag e (e.name)),
-          (s.tag 'dd' (e.name <Free-Idx>)) :: t.new-var,
+    t1 : (DECL s.type t.var) =
+      <Process-Var (e.decls) (e.subst) s.type t.var> :: e.d (e.decls) (e.subst),
+      e.d <Remove-Dupl-Decl (e.decls) (e.subst) e.rest>;
+    t1 : (EXPR t.var e.expr) =
+      <Process-Var (e.decls) (e.subst) Expr t.var> :: e.d (e.decls2) (e.subst2),
+      {
+        e.d : (DECL s t.new-var) =
           (EXPR t.new-var <Remove-Dupl-Decl (e.decls) (e.subst) e.expr>)
-          <Remove-Dupl-Decl (e.decls (DECL Expr t.new-var)) (e.subst (t.var t.new-var)) e.rest>;
-      };
-      (EXPR t.var <Remove-Dupl-Decl (e.decls) (e.subst) e.expr>)
-      <Remove-Dupl-Decl (e.decls (DECL Expr t.var)) (e.subst) e.rest>;
-    };
+          <Remove-Dupl-Decl (e.decls2) (e.subst2) e.rest>;
+        (ASSIGN t.var <Remove-Dupl-Decl (e.decls) (e.subst) e.expr>)
+        <Remove-Dupl-Decl (e.decls2) (e.subst2) e.rest>;
+      };
+    t1 : (s.split expr (e.len) t.var1 t.var2), s.split : \{ LSPLIT; RSPLIT; } =
+      <Remove-Dupl-Decl (e.decls) (e.subst) expr (e.len)> :: expr,
+      <Process-Var (e.decls) (e.subst) Split t.var1> :: e.decl1 (e.decls) (e.subst),
+      {
+        e.decl1 : (DECL s.type t.new-var) = t.new-var;
+        t.var1;
+      } :: t.var1,
+      <Process-Var (e.decls) (e.subst) Split t.var2> :: e.decl2 (e.decls) (e.subst),
+      {
+        e.decl2 : (DECL s.type t.new-var) = t.new-var;
+        t.var2;
+      } :: t.var2,
+      (s.split expr t.var1 t.var2) <Remove-Dupl-Decl (e.decls) (e.subst) e.rest>;
     e.subst : e (t1 t.new-var) e =
       <Remove-Dupl-Decl (e.decls) (e.subst) t.new-var e.rest>;
@@ -155 +162 @@
   };
   /*empty*/ = /*empty*/;
+};
+
+Process-Var (e.decls) (e.subst) s.type t.var, {
+  e.decls : $r e (DECL s.type-old t.var) e = {
+    s.type : s.type-old = /*empty*/ (e.decls) (e.subst);
+    t.var : (s.tag e (e.name)),
+      (s.tag 'dd' (e.name <Free-Idx>)) :: t.new-var,
+      (DECL s.type t.new-var) :: t.decl,
+      t.decl (e.decls t.decl) (e.subst (t.var t.new-var));
+  };
+  (DECL s.type t.var) (e.decls (DECL s.type t.var)) (e.subst);
 };
 
@@ -220 +238 @@
 
 
-$box Idx;
-
 Free-Idx =
   {

to-imperative/trunk/compiler/rfp_asail_java.rf

@@ -84 +84 @@
         <? &Entry-Name> : v.name =
           ()
-          ('public static void main (java.lang.String[] args) {'
-            (('RefalRuntime.setArgs ("'e.java-module-name'", args);')
-             ('try {' (v.name' (new Result ());') '}')
-             ('catch (RefalException e) {' ('System.out.println ("$error: " + e);') '}')
-            )
-          '}');;
+          ('public static void main (java.lang.String[] args) {' (
+            ('RefalRuntime.setArgs ("'e.java-module-name'", args);')
+            ('try {' (v.name' (new Result ());') '}')
+            ('catch (RefalException e) {' (
+              ('java.lang.System.out.println ("$error: " + e);')
+              ('java.lang.System.exit (100);')
+            )'}')
+          )'}');;
       } :: e.entry,
       (e.java-module-name)

to-imperative/trunk/compiler/rfp_check.rf

@@ -60 +60 @@
  * 4) All function calls are performed with expressions of right formats.
  */
-Satisfies-Format? (e.InFormat) (e.OutFormat) e.Sentence =
+Satisfies-Format? (e.InFormat) (e.OutFormat) e.Sentence, {
+  e.Sentence : $r e.Snt (ERROR t) e.queue =
+    <Satisfies-Format? () ((EVAR)) e.queue>,
+    <Satisfies-Format? (e.InFormat) () e.Snt>;
   e.Sentence (e.OutFormat) $iter {
-    e.Sentence : $r e.Snt (ERROR t) e.queue =
-      <Satisfies-Format? () ((EVAR)) e.queue>,
-      e.Snt ();
     e.Sentence : e.Snt t.Statement,
       t.Statement : {
         (RESULT t.Pragma e.ResultExpression) =
           {
+            e.ResultExpression : (s.block e), s.block : \{ BLOCK; BLOCK?; } =
+              <Satisfies-Format? () (e.OutFormat) e.ResultExpression>,
+              e.Snt ();
             <Subformat? (e.OutFormat) (<Format-Exp e.ResultExpression>)> =
               <Check-Inputs e.ResultExpression>,
@@ -131 +134 @@
         (CUT t) = e.Snt ();
         (STAKE t) = e.Snt ();
-        (BRANCH t e.Snt1) = e.Snt1 (e.OutFormat);
+        (BRANCH t e.Snt1) =
+          <Satisfies-Format? (e.InFormat) (e.OutFormat) e.Snt1> ();
         (Comp Branch) = /*empty*/ ();
       };
   } :: e.Sentence (e.OutFormat),
   e.Sentence : /*empty*/;
+};
 
 /*

to-imperative/trunk/compiler/rfp_clashes.rf

@@ -213 +213 @@
       (0) (0) e.Pe;
     } : (e.left) (e.right) expr,
-    <UHP-Clash LEFT  &L- 1 0 () () (e.left ) (t.Re) expr>
+    <UHP-Clash LEFT  &L 1 0 () () (e.left ) (t.Re) expr>
       :: e.l-clashes (e.l-conds) (e.l-assigns) (e.left ) (expr),
-    <UHP-Clash RIGHT &R- 0 1 () () (e.right) (t.Re) expr>
+    <UHP-Clash RIGHT &R 0 1 () () (e.right) (t.Re) expr>
       :: e.r-clashes (e.r-conds) (e.r-assigns) (e.right) (expr),
     <Bind &Hard-Parts (s.idx) ((e.left) (e.right) expr)>,

to-imperative/trunk/compiler/rfp_compile.rf

@@ -92 +92 @@
 
 $func Prepare-Res e.Reult-exprs = e.Result-exprs;
+
+$func Prepare-Const e.const-expr = e.const-expr;
 
 $func Comp-Assigns e.assignments = e.asail-assignments;
@@ -164 +166 @@
         (e.decl) e.comp-func;
       (s.link CONST t.pragma t.name e.expr) =
-        (CONSTEXPR s.link t.name (e.expr) e.expr) :: t.const,
+        (CONSTEXPR s.link t.name (e.expr) <Prepare-Const e.expr>) :: t.const,
         <Put &Declarations t.const>,
         {
@@ -790 +792 @@
   };
 
+
+Prepare-Const {
+  (PAREN expr) e.rest = (PAREN <Prepare-Const expr>) <Prepare-Const e.rest>;
+  t1 e.rest = <Ref-Func? t1> <Prepare-Const e.rest>;
+  /*empty*/ = /*empty*/;
+};
 
 

to-imperative/trunk/compiler/rfp_format.rf

@@ -10 +10 @@
 $func Split-Rt t.Ft t.Rt = e.splited-Rt;
 
-//$func MSG-Exprs (e.Fe1) e.Fe2 = e.Fe;
-$func MSG-Exprs e = e;
+$func MSG-Exprs (e.Fe1) e.Fe2 = e.Fe;
 
 $func MSG-Terms t.Ft1 t.Ft2 = t.Ft;
@@ -116 +115 @@
  */
 MSG-Exprs {
+  ((FAIL)) e.Fe2 = e.Fe2;
+  (e.Fe1) (FAIL) = e.Fe1;
   (t.Ft1 e.Fe1) t.Ft2 e.Fe2 \?
     /*

to-imperative/trunk/compiler/rfp_helper.rf

@@ -4 +4 @@
 
 $use Access Arithm Box Class Compare StdIO Table;
-
-Abs s.num, {
-  <"<" (s.num) (0)> = <"*" s.num -1>;
-  s.num;
-};
-
-Max s1 s2, {
-  <">" (s1) (s2)> = s1;
-  s2;
-};
 
 $table Empty-Table;
@@ -83 +73 @@
 
 /*
- * Repeat e.expr s.num times.
- */
-Repeat {
-  0 e = /*empty*/;
-  s.num expr = expr <Repeat <"-" s.num 1> expr>;
-};
-
-/*
  * Search for e.pattern in expr (in all depths).
  */
@@ -98 +80 @@
 };
 
-
-L- s1 e2 = <L s1 e2>;
-
-R- s1 e2 = <R s1 e2>;
-
-Char?- e1 = <Char? e1>;
-
-Int?- e1 = <Int? e1>;
-

to-imperative/trunk/compiler/rfp_helper.rfi

@@ -5 +5 @@
 $table RFP-Options ;
 $table RFP-Module-Subst;
-
-$func Abs s.num = s.abs;
-
-//$func Max s1 s2 = s.max;
-$func Max e = e;
 
 $func RFP-Clear-Table s.tbl = ;
@@ -26 +21 @@
 $func Subst (e.patterns) (e.replaces) expr = expr;
 
-// repeat e.expr s.num times
-$func Repeat s.num expr = expr;
-
 // search for e.pattern in expr (in all depths).
 $func? In? (e.pattern) expr = ;
 
 
-$func? L- e = e;
-
-$func? R- e = e;
-
-$func? Char?- e = e;
-
-$func? Int?- e = e;
-

to-imperative/trunk/compiler/rfp_lex.rf

@@ -100 +100 @@
   e.ts <Scan-Tokens>;
 
+Find-Includes e.filename =
+  <Store &Source>,
+  <Store &Saved-Sources>,
+  <Store &Position>,
+  <Store &Source-Index>,
+  <Store &Src-Counter 0>,
+  {
+    <RFP-Src-Open-File e.filename>;
+    <PrintLN! &StdErr 'Error: cannot open source file ' e.filename>,
+      <Exit 1>;
+  } :: e.source,
+  <Push-Source e.source S 0 1>,
+  (/*e.includes*/) (/*e.line*/) /*e.stop?*/ $iter <Scan-Token e.line> : {
+    ((e (EOF))) e = (e.includes) () STOP;
+    ((e (USE))) (e.ln) =
+      () (e.ln) /*e.st?*/ $iter <Scan-Token e.ln> : {
+        ((e (SEMICOLON))) (e.l) = (e.incs) (e.l) STOP;
+        (((e.p) (s.WORD-or-QWORD e.s))) (e.l),
+          s.WORD-or-QWORD : \{
+            WORD;
+            QWORD;
+          } =   (e.incs (e.s)) (e.l);
+        (((e.p) (EOF))) =
+          <PrintLN! &StdErr 'Error: unexpected end of file during $use parsing'>,
+          <Exit 2>, () ();
+        (((e.p) (e.tag))) =
+          <PrintLN! &StdErr 'Error: unexpected token 'e.tag' during $use parsing'>,
+          <Exit 2>, () ();
+      } :: (e.incs) (e.ln) e.st?,
+      e.st? : STOP =
+      (e.includes e.incs) (e.ln);
+    e (e.ln) = (e.includes) (e.ln);
+  } :: (e.includes) (e.line) e.stop?,
+  e.stop? : STOP =
+  e.includes;
+
 Push-Source e.source s.type s.row s.col =
   <? &Src-Counter> : s.n,
@@ -134 +170 @@
         e.t : {
           ((e) (SEMICOLON)) = (e.nts) (e.line) F;
-          ((e.p) (s.WORD-or-QWORD e.s)) =
+          ((e.p) (s.WORD-or-QWORD e.s)),
+            s.WORD-or-QWORD : \{
+              WORD = CI;
+              QWORD = NOT-CI;
+            } :: s.ci? =
             {
               <Lookup &RFP-Module-Subst e.s>;
               e.s;
             } :: e.s,
-            {
-              s.WORD-or-QWORD : WORD = CI;
-              NOT-CI;
-            } :: s.ci?,
             {
               <RFP-Debug?>, <PrintLN "Processing " e.s>;;
@@ -153 +189 @@
                 e.nts;
             } :: e.nts,
+            (e.nts) (e.line) T;
+          ((e.p) (EOF)) =
+            <RFP-Error (e.p) ("Unexpected end of file")>,
+            (e.nts) (e.line) F;
+          ((e.p) (e.tag)) =
+            <RFP-Error (e.p) ("Unexpected token "e.tag)>,
             (e.nts) (e.line) T;
         };

to-imperative/trunk/compiler/rfp_lex.rfi

@@ -22 +22 @@
 
 $func RFP-Lexer e.filename = e.tokens ;
+
+$func Find-Includes e.filename = e.includes ;

to-imperative/trunk/compiler/rfp_parse.rf

@@ -560 +560 @@
     (e.pos) /*empty*/ $iter
       {
-        e.items (BRANCH <Pragma e.snt-end-pos> <Parse-Sentence e.colon-pos>)
+        e.items (BRANCH <Pragma e.snt-end-pos> <Parse-Alt e.colon-pos>)
         :: e.items,
           <Expect-Token SEMICOLON> :: (e.snt-end-pos) t,
@@ -645 +645 @@
 Parse-Source // [] = e.item
   =
-  <Expect-Token LBRACE TLBRACE EMPTY> :: (e.pos) (s.type e),
+//  <Expect-Token LBRACE TLBRACE EMPTY> :: (e.pos) (s.type e),
   {
-    s.type :
-      \{
-        LBRACE;
-        TLBRACE;
-      } =
-        (e.pos) /*empty*/ $iter
-          {
-            e.items (BRANCH <Pragma e.snt-end-pos> <Parse-Path>) :: e.items,
-              <Expect-Token SEMICOLON> :: (e.snt-end-pos) t,
-              (e.snt-end-pos) e.items;
-          } :: (e.snt-end-pos) e.items,
-            <Expect-Token RBRACE EMPTY> : (e) (RBRACE e),
-            {
-              s.type : LBRACE = (BLOCK <Pragma e.pos> e.items);
-              (BLOCK? <Pragma e.pos> e.items);
-            };
-    (RESULT <Pragma e.pos> <Parse-Result>);
+//    s.type :
+//      \{
+//        LBRACE;
+//        TLBRACE;
+//      } =
+//        (e.pos) /*empty*/ $iter
+//          {
+//            e.items (BRANCH <Pragma e.snt-end-pos> <Parse-Path>) :: e.items,
+//              <Expect-Token SEMICOLON> :: (e.snt-end-pos) t,
+//              (e.snt-end-pos) e.items;
+//          } :: (e.snt-end-pos) e.items,
+//            <Expect-Token RBRACE EMPTY> : (e) (RBRACE e),
+//            {
+//              s.type : LBRACE = (BLOCK <Pragma e.pos> e.items);
+//              (BLOCK? <Pragma e.pos> e.items);
+//            };
+    <Expect-Token EMPTY> :: (e.pos) e,
+      (RESULT <Pragma e.pos> <Parse-Result>);
   } :: e.items,
   e.items <Expect-Token COLON EMPTY> $iter {
@@ -734 +735 @@
         <Expect-Token RBRACKET> : e, e.items;
       s.type : \{ LBRACE; TLBRACE; } =
-        <Unget-Token (e.pos) (s.type e.value)>,
-        <Parse-Source>;
+        (e.pos) /*empty*/ $iter {
+          e.items (BRANCH <Pragma e.snt-end-pos> <Parse-Path>) :: e.items,
+            <Expect-Token SEMICOLON> :: (e.snt-end-pos) t,
+            (e.snt-end-pos) e.items;
+        } :: (e.snt-end-pos) e.items,
+        <Expect-Token RBRACE EMPTY> : (e) (RBRACE e),
+        {
+          s.type : LBRACE = (BLOCK <Pragma e.pos> e.items);
+          (BLOCK? <Pragma e.pos> e.items);
+        };
     };
 

to-imperative/trunk/compiler/rfpc.rf

@@ -36 +36 @@
 $use "rfp_asail2asail";
 
-$use StdIO;
-$use Box;
-$use Dos;
-$use Arithm;
-$use Table;
-$use Convert;
-$use Class;
-$use Access;
-$use Compare;
-$use CppMangle;
+$use Access Arithm Box Class Compare Convert CppMangle Dos List Table StdIO;
 
 $const RevDate = ('$Revision$') ('$Date$');
@@ -110 +101 @@
                   <Store s.len <"+" s.st-len s.n-len>>,
                   <PrintLN>,
-                  <Print <Repeat s.st-len ' '>>;
+                  <Print <Replicate s.st-len ' '>>;
                 <Store s.len s.new>;
               },
@@ -360 +351 @@
               <Open-Channel e.java-module-name ('.java')> :: s.channel s.need-close?,
               {
-                e.dirname : v =
-                  <PrintLN! s.channel
-                  'package '<Subst (&RFP-Dir-Separator) (('.')) e.dirname>';\n'>;;
+                <? &RFP-Include-Path> : e (e.dir) e,
+                  e.dirname : \{
+                    e.dir = /*empty*/;
+                    e.dir &RFP-Dir-Separator e.package = e.package;
+                  };
+                e.dirname;
+              } :: e.package,
+              {
+                e.package : v =
+                  <PrintLN! s.channel 'package 'e.package';\n'>;;
               },
               <PrintLN! s.channel 'import org.refal.plus.*;'>,
@@ -440 +438 @@
   ' ' :: e.start1,
   29 :: s.2nd-col,
-  <Repeat s.2nd-col ' '> :: e.start2,
+  <Replicate s.2nd-col ' '> :: e.start2,
   <PrintLN "Refal+ compiler " <Version>>,
   <PrintLN "Copyright blah-blah-blah">,
@@ -467 +465 @@
           <PrintLN
             <? s.line>
-            <Repeat <"-" s.2nd-col <Length <? s.line>>> ' '>
+            <Replicate <"-" s.2nd-col <Length <? s.line>>> ' '>
             s.phrase
           >,