Changeset 1825 for to-imperative/trunk/compiler/rfpc.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/rfpc.rf (modified) (5 diffs)

to-imperative/trunk/compiler/rfpc.rf

@@ -303 +303 @@
                   e.exports;
               } :: e.exports,
-              <RFP-ASAIL-To-Java t.asail-mod-name (e.exports) e.module> :: e.module,
+              <RFP-ASAIL-To-Java t.asail-mod-name (e.exports) e.module> :: (e.inputs) e.module,
               <Verbose "compilation from as-ail to java finished">,
               <Open-Channel e.basename ('.java')> :: s.channel s.need-close?,
@@ -309 +309 @@
                 e.dirname : v =
                   <PrintLN! s.channel
-                  'package '<Subst (&RFP-Dir-Separator) (('.')) e.dirname>';'>;;
+                  'package '<Subst (&RFP-Dir-Separator) (('.')) e.dirname>';\n'>;;
               },
               <PrintLN! s.channel 'import org.refal.plus.*;'>,
+              {
+                e.inputs : e (e.java-module) e,
+                  <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,
+                  <PrintLN! s.channel 'import 'e.java-module';'>,
+                  $fail;;
+              },
               <CPP-Pretty-Print 0 s.channel () e.module>,
               { s.need-close? : 1 = <Close-Channel s.channel>;; },
@@ -324 +334 @@
   ((('I') ('ipath')) IPATH
     ("dir") "add <dir> to the list of directories to be searched" "for .rfi files")
+  ((('B') ('bootpath')) BPATH
+    ("dir") "add <dir> to the list of directories to be searched" "for standard library .rfi files")
   ((('ne') ('no-elaborate')) (BIND NO-ELABORATE))
   ((('nc') ('no-check')) (BIND NO-CHECK)
@@ -414 +426 @@
                   <? &RFP-Include-Path> : e1 (e2 &RFP-Dir-Separator),
                     <Store &RFP-Include-Path e1 (e2)>;
+                };
+            };
+          BPATH =
+            <Store &RFP-Boot-Path <? &RFP-Boot-Path> (v.arg)>,
+            {
+              $iter
+                # \{
+                  <? &RFP-Boot-Path> : e1 (e2 &RFP-Dir-Separator),
+                    <Store &RFP-Boot-Path e1 (e2)>;
                 };
             };
@@ -468 +489 @@
 
 RFP-Set-Path =
-  <Store &RFP-Include-Path <? &RFP-Include-Path> &RFP-Default-Include-Path>;
+  <Store &RFP-Boot-Path <? &RFP-Boot-Path> &RFP-Default-Include-Path>,
+  <Store &RFP-Include-Path <? &RFP-Include-Path> <? &RFP-Boot-Path>>;
 
 Get-Ready-To-Work e.Items =