Changeset 1825 for to-imperative/trunk/compiler/rfp_lex.rf

Timestamp:

Dec 29, 2005, 4:57:15 AM (15 years ago)

Author:

orlov

Message:

• Added proper generation of imports in Java code.

File:

• to-imperative/trunk/compiler/rfp_lex.rf (modified) (3 diffs)

to-imperative/trunk/compiler/rfp_lex.rf

@@ -479 +479 @@
     v = e.dirname &RFP-Dir-Separator;
     e = '.' &RFP-Dir-Separator;
-  } :: e.dirname,
+  } :: e.dirn,
 //  {
 //    e.name $iter { e.name : e1 '.' e2 = e1 &RFP-Dir-Separator e2; } :: e.name,
@@ -487 +487 @@
     <In-Table? &RFP-Options CASE-INSENSITIVE> \!
       {
-        $trap <Open-Dir e.dirname> $with {
+        $trap <Open-Dir e.dirn> $with {
           e = $fail;
         };
@@ -498 +498 @@
               s.ci? : CI, <To-Upper e.basename> : e.NAME;
             } =
-            (<Try-Open e.dirname e.basename '.rfi'>);;
+            (<Try-Open e.dirn e.basename '.rfi'>);;
         };
       } :: e.res,
       e.res : (e.source) =
       e.source;
-    <Try-Open e.dirname e.name '.rfi'>;
-  };
+    <Try-Open e.dirn e.name '.rfi'>;
+  } :: e.source,
+  {
+    <? &RFP-Boot-Path> :: e.tmp, e.tmp : e (e.dirname) e =
+      <Bind &RFP-Includes (e.name) (BOOT e.dirn)>;
+    <Bind &RFP-Includes (e.name) (LOCAL e.dirn)>;
+  },
+  e.source;
 
 Try-Open e.filename =