Changeset 1150


Ignore:
Timestamp:
Aug 11, 2003, 12:48:44 PM (17 years ago)
Author:
pooh
Message:
  • Implemented Dos::Arg() and StdIO::Read-Line!().
  • Some fixes for bootstrapping.
Location:
to-imperative/trunk
Files:
2 added
12 edited

Legend:

Unmodified
Added
Removed
  • to-imperative/trunk/bootstrap/Makefile

    r1063 r1150  
    1515          CURRENTDIR=$(CURRENTDIR)/bootstrap DISTNAME="$(DISTNAME)" \
    1616          RFPC="../rfpc.sh" \
    17           CPPFLAGS="-I../../runtime -I../../libp++ -I../../library/include"
     17          CPPFLAGS="-I../../runtime -I../../libp++ -I../../library/include" \
     18          LDFLAGS+="-L../../library -L../../runtime" \
     19          LDFLAGS+="-L../../libp++ -L../../libstdc++-stub" \
     20          LDLIBS+="-lrf -lrfrt -lp++ -lsupc++ -lgmp" \
     21          RFP="$(CXX)"
    1822
    1923clean::
  • to-imperative/trunk/bootstrap/rfpc.sh

    r1148 r1150  
    33../../compiler/rfpc -rfp-heapsize 50000000 -cc $*
    44ccfile=`echo $1 | sed -e 's/\.rf/\.cc/'`
    5 gcc -c $ccfile -I../../runtime -I../../libp++ -I../../library/include
     5gcc -g -c $ccfile -I../../runtime -I../../libp++ -I../../library/include
  • to-imperative/trunk/compiler/Makefile

    r811 r1150  
    6161endif
    6262
     63ifeq ($(RFP),rfp)
     64LDFLAGS=
     65LDLIBS=
     66endif
     67
    6368%.o: %.rf Makefile $(TOPDIR)/config.mk
    6469        $(RFPC) $<
    6570
    6671rfpc: $(RFPC_OBJECTS)
    67         $(RFP) -o $@ $^
     72        $(RFP) -o $@ $^ $(LDFLAGS) $(LDLIBS)
    6873
    6974rfp-synhl: $(SYNHL_OBJECTS)
    70         $(RFP) -o $@ $^
     75        $(RFP) -o $@ $^ $(LDFLAGS) $(LDLIBS)
    7176
    7277rfp-filt: $(FILT_OBJECTS)
    73         $(RFP) -o $@ $^
     78        $(RFP) -o $@ $^ $(LDFLAGS) $(LDLIBS)
    7479
    7580clean::
  • to-imperative/trunk/library/Convert/to_int.cc

    r1112 r1150  
    106106  //проверка, что длина не больше, чем len_max
    107107  //
    108   if (len >= len_max)
     108//  if (len >= len_max)
    109109    s_Int = Integer::create_expr(s);
    110   else
    111     s_Int = Int32::create_expr(s);
     110//  else
     111//    s_Int = Int32::create_expr(s);
    112112 
    113113RF_END
  • to-imperative/trunk/library/Dos/Makefile

    r1013 r1150  
    77MODULES = \
    88  time \
    9   exit
     9  exit \
     10  arg
    1011
    1112SOURCES = $(addsuffix .cc, $(MODULES))
  • to-imperative/trunk/library/Makefile

    r1102 r1150  
    2525
    2626$(LIBRF): $(lists)
     27        rm -rf $@
    2728        $(AR) cru $@ $(foreach dir, $(SUBDIRS), $(addprefix $(dir)/, $(shell cat $(dir)/module.list)))
    2829
  • to-imperative/trunk/library/StdIO/Makefile

    r986 r1150  
    1010  print_e_ \
    1111  write_e_ \
     12  read_m_line \
     13  read \
    1214  channel \
    1315  open_file \
  • to-imperative/trunk/library/StdIO/std_channels.cc

    r830 r1150  
    1010{
    1111
    12 Channel StdIn(stdin) ;
    13 Channel StdOut(stdout) ;
    14 Channel StdErr(stderr) ;
     12Expr StdIn(new rftype::Channel (stdin));
     13
     14Expr StdOut(new rftype::Channel (stdout));
     15
     16Expr StdErr(new rftype::Channel (stderr));
     17
    1518
    1619}
  • to-imperative/trunk/library/include/refal/StdIO.hh

    r898 r1150  
    1212{
    1313
    14 const Expr StdIn = new rftype::Channel ();
     14extern Expr StdIn ;
    1515
    16 const Expr StdOut = new rftype::Channel ();
     16extern Expr StdOut ;
    1717
    18 const Expr StdErr = new rftype::Channel ();
     18extern Expr StdErr ;
    1919
    2020RF_DECL (Channel);
  • to-imperative/trunk/runtime/rf_core.cc

    r1106 r1150  
    114114RetVal (*entry) () = null ;
    115115
     116int argc ;
     117char** argv ;
     118
    116119}
    117120
    118121using namespace rfrt;
    119122
    120 int main ()
     123int main (int _argc, char* _argv[])
    121124{
     125  argc = _argc;
     126  argv = _argv;
    122127  double start = clock ();
    123128  Expr res;
  • to-imperative/trunk/runtime/rf_core.hh

    r1066 r1150  
    5858};
    5959
     60extern int argc ;
     61extern char** argv ;
     62
    6063}
    6164
  • to-imperative/trunk/runtime/rf_macros.hh

    r884 r1150  
    124124  extern RetVal f (void)
    125125
    126 #define RF_ARG Arg
    127 #define RF_RES Result
     126#define RF_ARG rfrt::Arg
     127#define RF_RES rfrt::Result
    128128
    129129#define RF_END \
Note: See TracChangeset for help on using the changeset viewer.