Changeset 2710


Ignore:
Timestamp:
Apr 18, 2007, 1:07:44 AM (14 years ago)
Author:
yura
Message:
 
File:
1 edited

Legend:

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

    r2707 r2710  
    8080Arg_GetInterfaceReader e.qname =
    8181  <Store &FormatsFromClass>,
    82   //<WriteLn "Arg_GetInterfaceReader: " e.qname>,
    8382  <Get &DirSeparator> : s.dir_separator,
    8483  \{
     
    8786      <Try_Open e.dirname e.fname '.rfi'>;
    8887    $trap
    89       <Intersperse ('/') e.qname> '.rfi' :: e.fname,
    90       <GetSystemResourceAsStream <ToWord e.fname>> <Null> : \{
    91         s.null s.null, $fail;
     88      <Intersperse ('/') e.qname> '.rfi' :: e.fname, \?
     89      <GetSystemResourceAsStream <ToWord e.fname>> <Null> : {
     90        s.null s.null, \! $fail;
    9291        s.is   s.null = FILE &Get_Line_From_Reader (e.fname) (<BufferedReader <InputStreamReader s.is>>);
    9392      }
     
    10099    };
    101100    <Intersperse (s.dir_separator) e.qname> :: e.fname,
    102       <Get &RFP_Include_Path> : e (e.dirname) e,
    103       <ReadFormatsFromFile <ToWord e.dirname e.fname '.class'>> <Null> : \{
    104         s.null s.null, $fail;
     101      <Get &RFP_Include_Path> : e (e.dirname) e, \?
     102      <ReadFormatsFromFile <ToWord e.dirname e.fname '.class'>> <Null> : {
     103        s.null s.null, \! $fail;
    105104        s.str  s.null = <Store &FormatsFromClass <ToChars s.str>>,
    106105          FILE &ReadFormatsFromBox (e.dirname e.fname '.class') ();
    107106      };
    108     <Intersperse ('/') e.qname> '.class' :: e.fname,
    109       <ReadFormatsFromClass <ToWord e.fname>> <Null> : \{
    110         s.null s.null, $fail;
     107    <Intersperse ('/') e.qname> :: e.fname, \?
     108      <ReadFormatsFromClass <ToWord e.fname>> <Null> : {
     109        s.null s.null, \! $fail;
    111110        s.str  s.null = <Store &FormatsFromClass <ToChars s.str>>,
    112           FILE &ReadFormatsFromBox (e.fname) ();
     111          FILE &ReadFormatsFromBox (e.fname '.class') ();
    113112      };
    114113  };
Note: See TracChangeset for help on using the changeset viewer.