Changeset 2389


Ignore:
Timestamp:
Feb 11, 2007, 12:46:48 PM (14 years ago)
Author:
orlov
Message:
  • Don't cycle on $import-s.
  • Generate Refal names in $error-s.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • to-imperative/trunk/compiler/rfp_asail_jbc.rf

    r2387 r2389  
    1818
    1919$box Module-Name;
     20$box Refal-Module-Name;
    2021
    2122$box Entry;
     
    7172  },
    7273  <Store &Entry-Name /*empty*/>,
     74  <Store &Refal-Module-Name <To-Word e.module-name>>,
    7375  <Concat <Map! &To-Word (<Separate (<? &Dir-Separator>) e.package> <Separate ('.') <Rfp2Java e.module-name>>)>>
    7476  :: e.java-module-name,
     
    251253Qualified-Module-Name {
    252254  s.module-name =
     255    <? &Dir-Separator> : s.dir-separator,
    253256    <Lookup &RFP-Includes s.module-name> : {
    254257      BOOT e = 'org/refal/plus/library/';
     
    259262          e.dir s.dir-separator e.p = e.p;
    260263        } :: e.p,
    261         <Subst (<? &Dir-Separator>) (('/')) e.p>;
     264        {
     265          s.dir-separator : '/' = e.p;
     266          <Subst (s.dir-separator) (('/')) e.p>;
     267        };
    262268      LOCAL = /*empty*/;
    263269    } :: e.p,
     
    290296      <"+" &"ACC_STATIC" <Access-Mode t.name>> :: s.accessMode,
    291297      t.name : (e s.funcName),
     298      <Store &Func-Name s.funcName>,
    292299      <To-Word <Rfp2Java s.funcName>> :: s.funcName,
    293       <Store &Func-Name s.funcName>,
    294300      { <? &Entry> : e t.name e = <Store &Entry-Name s.funcName>;; },
    295301      <Function-Description (e.args) (e.ress) s.retType> :: s.desc,
     
    463469      <MVvisitTypeInsn <MV> &NEW "org/refal/plus/RefalException">,
    464470      <MVvisitInsn <MV> &DUP>,
    465       <MVvisitLdcInsn <MV> <WordToString <To-Word <Intersperse ('.') <? &Module-Name>>>>>,
     471      <? &Refal-Module-Name> : s.mod-name,
     472      <MVvisitLdcInsn <MV> <WordToString s.mod-name>>,
    466473      <? &Func-Name> : s.fname,
    467474      <MVvisitLdcInsn <MV> <WordToString s.fname>>,
Note: See TracChangeset for help on using the changeset viewer.