Changeset 2185


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • to-imperative/branches/changing_directory_structure/rfp

    • Property svn:ignore set to
      rfpj*.class
      rfpj.java
      rfpj.cc
      rfpj.hh
  • to-imperative/branches/changing_directory_structure/rfp/makeall.bat

    r2176 r2185  
    44
    55call %~p0\..\c++\config.bat
    6 SET RFLAGS=%RFLAGS% -I ..\c++\compiler
     6SET RFLAGS=%RFLAGS% -I ..\compiler -e rfpj.Main
    77SET LFLAGS=%LFLAGS% /OUT:rfpj.exe
    88
    99:call_rfp
    10 call rfp.bat init_stderr.obj rfpj.rf ..\c++\compiler\rfp*.obj
     10call rfp.bat init_stderr.cc rfpj.rf ..\compiler\rfp*.rf
  • to-imperative/branches/changing_directory_structure/rfp/rfpj.rf

    r2095 r2185  
    2222$func Run-javac e.files = ;
    2323
    24 $func? Search e.files = (e.dir) e.file;
     24$func? Search e.files = s.path-group (e.dir) e.file;
    2525
    2626$func Parse-Path e.path = e.dir-list;
     
    181181      {
    182182        <Lookup &RFPJ-Opts LIBRFI>;
    183         e.rfpdir s.dir-sep "library" s.dir-sep "include" s.dir-sep "refal-plus";
     183        e.rfpdir s.dir-sep "lib";
    184184      } :: e.librfi,
    185185      <Store &LIBRFI (e.librfi)>,
     
    274274  {
    275275    <In-Table? &Deps e.module-name>;
    276     <Search (e.module-name".rf") (e.module-name".rfi")> :: (e.path) e.file =
     276    <Search (e.module-name".rf") (e.module-name".rfi")> :: s.path-grp (e.path) e.file =
    277277      <? &Dir-Separator> : s.dir-sep,
    278278      e.path s.dir-sep e.module-name :: e.mod,
    279279      <Verbose 3 " +++ "e.mod>,
    280280      {
    281         e.file : e.f ".rf" =
     281        e.file : e.f ".rf", s.path-grp : RFPATH =
    282282          {
    283283            e.f : $r e.p s.dir-sep e.n = (e.path s.dir-sep e.p s.dir-sep) e.n;
     
    295295    $error ("Can't find refal module "e.module-name)
    296296        ("Searched in:")
    297         <Map! &Id " - " (<? &RFPATH>)>;
     297        <Map! &Id " - " (<? &RFPATH> <? &LIBRFI>)>;
    298298  };
    299299
     
    389389};
    390390
     391$func? Search-In-Path (e.path) e.files = (e.dir) e.file;
     392
    391393Search e.files =
    392   <? &RFPATH> <? &LIBRFI> : e (e.dir) e,
     394  \{
     395    RFPATH <Search-In-Path (<? &RFPATH>) e.files>;
     396    LIBRFI <Search-In-Path (<? &LIBRFI>) e.files>;
     397  };
     398
     399Search-In-Path (e.path) e.files =
     400  e.path : e (e.dir) e,
    393401  e.files : e (e.f) e,
    394402  <Exists? e.dir <? &Dir-Separator> e.f> =
Note: See TracChangeset for help on using the changeset viewer.