Changeset 2195

Timestamp:

Dec 25, 2006, 2:58:48 AM (14 years ago)

Author:

orlov

Message:

• New $func? Convert.Read-Expr expr = e.terms;

Location:

to-imperative/trunk

Files:

• c++/Makefile (modified) (1 diff)
• c++/compiler/rfpc.cc (modified) (1 diff)
• c++/include/refal/Convert.hh (modified) (1 diff)
• c++/lib/Convert/Makefile (modified) (1 diff)
• c++/lib/Convert/read_expr.cc (added)
• java/Makefile (modified) (2 diffs)
• java/org/refal/plus/library/Convert.java (modified) (1 diff)
• lib/Convert.rf (added)
• lib/Convert.rfi (modified) (1 diff)

to-imperative/trunk/c++/Makefile

@@ -74 +74 @@
         install -m 0755 rfp.sh $(INSTALL_DIR)/bin/
         mkdir -p -m 0755 $(INSTALL_DIR)/include
-        cp -rf include/refal $(INSTALL_DIR)/include
-        mkdir -p -m 0755 $(INSTALL_DIR)/lib
-        cp -rf ../lib $(INSTALL_DIR)/lib/refal-plus
+        cp -rf include/refal $(INSTALL_DIR)/include/
+        mkdir -p -m 0755 $(INSTALL_DIR)/lib/refal-plus
+        cp -rf ../lib/* $(INSTALL_DIR)/lib/refal-plus/
 
 clean::

to-imperative/trunk/c++/compiler/rfpc.cc

@@ -4319 +4319 @@
 {
   RFP_m_Root = Char::create_expr (L"/usr");
-  RFP_m_Default_m_Include_m_Path = (Char::create_expr (L"/usr/include/refal-plus")) () + (Char::create_expr (L"/usr/local/include/refal-plus")) ();
+  RFP_m_Default_m_Include_m_Path = (Char::create_expr ("/home/orlov/tmp2//lib/refal-plus")) ();
   RFP_m_Boot_m_Path = Expr::create_sym< rftype::NamedObject<rftype::BoxContents> >(L"RFP-Boot-Path");
   RFP_m_Include_m_Path = Expr::create_sym< rftype::NamedObject<rftype::BoxContents> >(L"RFP-Include-Path");

to-imperative/trunk/c++/include/refal/Convert.hh

@@ -26 +26 @@
 RF_DECL (To_m_Word);
 
+RF_DECL (Read_m_Expr);
+
 }
 

to-imperative/trunk/c++/lib/Convert/Makefile

@@ -12 +12 @@
   chars_to_bytes \
   to_int \
-  to_word
+  to_word \
+  read_expr
 
 SOURCES = $(addsuffix .cc, $(MODULES))

to-imperative/trunk/java/Makefile

@@ -1 +1 @@
 all:: \
+        Convert \
         CppMangle \
         cpp__specific \
@@ -11 +12 @@
         StreamErr \
         Stream
+
+Convert: ../lib/Convert.rf
 
 Error: ../lib/Error.rf

to-imperative/trunk/java/org/refal/plus/library/Convert.java

@@ -91 +91 @@
         res.assign(arr);
     }
+
+    /////////////////////// Begining of generated part ///////////////////
+
+  static public boolean Read_m_Expr (Expr _ve_xpr, Result _v_res1) throws RefalException
+  {
+    Result _ge_auxcall1 = new Result ();
+    To_m_Chars (_ve_xpr, _ge_auxcall1);
+    Result _vs_tream = new Result ();
+    Stream.Expr_m_Open (_ge_auxcall1.getExpr (), _vs_tream);
+    Expr _ve_res = Expr.empty;
+    _exit__iter1: for ( ; ; )
+    {
+      _iter1: {
+        if (!Stream.End_m_of_m_Stream_q_ (_vs_tream.getExpr ()))
+        {
+          break _iter1;
+        }
+        _v_res1.assign (_ve_res);
+        break _exit__iter1;
+      }
+      Result _v_Read_m_Term_q_1 = new Result ();
+      if (!Lexer.Read_m_Term_q_ (_vs_tream.getExpr (), _v_Read_m_Term_q_1))
+      {
+        return false;
+      }
+      _ve_res = new Expr (_ve_res, _v_Read_m_Term_q_1.getExpr ());
+    }
+    return true;
+  }
+
+    /////////////////////// End of generated part ///////////////////
+
 }

to-imperative/trunk/lib/Convert.rfi

@@ -4 +4 @@
 $func To-Upper       e.Char = e.Char;
 
-$func? To-Int    e.Exp  = s.Int;
-$func  To-Chars  e.Exp  = e.Char;
-$func  To-Word   e.Exp  = s.Word;
+$func? To-Int    e.Exp = s.Int;
+$func  To-Chars  e.Exp = e.Char;
+$func  To-Word   e.Exp = s.Word;
+
+$func? Read-Expr e.Exp = e.Exp;