Changeset 2185

Timestamp:

Dec 15, 2006, 1:48:01 AM (14 years ago)

Author:

orlov

Message:

• rfpj is adopted to the new directory structure.

Location:

to-imperative/branches/changing_directory_structure/rfp

Files:

• . (modified) (1 prop)
• makeall.bat (modified) (1 diff)
• rfpj.rf (modified) (5 diffs)

to-imperative/branches/changing_directory_structure/rfp/makeall.bat

@@ -4 +4 @@
 
 call %~p0\..\c++\config.bat
-SET RFLAGS=%RFLAGS% -I ..\c++\compiler
+SET RFLAGS=%RFLAGS% -I ..\compiler -e rfpj.Main
 SET LFLAGS=%LFLAGS% /OUT:rfpj.exe
 
 :call_rfp
-call rfp.bat init_stderr.obj rfpj.rf ..\c++\compiler\rfp*.obj
+call rfp.bat init_stderr.cc rfpj.rf ..\compiler\rfp*.rf

to-imperative/branches/changing_directory_structure/rfp/rfpj.rf

@@ -22 +22 @@
 $func Run-javac e.files = ;
 
-$func? Search e.files = (e.dir) e.file;
+$func? Search e.files = s.path-group (e.dir) e.file;
 
 $func Parse-Path e.path = e.dir-list;
@@ -181 +181 @@
       {
         <Lookup &RFPJ-Opts LIBRFI>;
-        e.rfpdir s.dir-sep "library" s.dir-sep "include" s.dir-sep "refal-plus";
+        e.rfpdir s.dir-sep "lib";
       } :: e.librfi,
       <Store &LIBRFI (e.librfi)>,
@@ -274 +274 @@
   {
     <In-Table? &Deps e.module-name>;
-    <Search (e.module-name".rf") (e.module-name".rfi")> :: (e.path) e.file =
+    <Search (e.module-name".rf") (e.module-name".rfi")> :: s.path-grp (e.path) e.file =
       <? &Dir-Separator> : s.dir-sep,
       e.path s.dir-sep e.module-name :: e.mod,
       <Verbose 3 " +++ "e.mod>,
       {
-        e.file : e.f ".rf" =
+        e.file : e.f ".rf", s.path-grp : RFPATH =
           {
             e.f : $r e.p s.dir-sep e.n = (e.path s.dir-sep e.p s.dir-sep) e.n;
@@ -295 +295 @@
     $error ("Can't find refal module "e.module-name)
         ("Searched in:")
-        <Map! &Id " - " (<? &RFPATH>)>;
+        <Map! &Id " - " (<? &RFPATH> <? &LIBRFI>)>;
   };
 
@@ -389 +389 @@
 };
 
+$func? Search-In-Path (e.path) e.files = (e.dir) e.file;
+
 Search e.files =
-  <? &RFPATH> <? &LIBRFI> : e (e.dir) e,
+  \{
+    RFPATH <Search-In-Path (<? &RFPATH>) e.files>;
+    LIBRFI <Search-In-Path (<? &LIBRFI>) e.files>;
+  };
+
+Search-In-Path (e.path) e.files =
+  e.path : e (e.dir) e,
   e.files : e (e.f) e,
   <Exists? e.dir <? &Dir-Separator> e.f> =