Changeset 2045 for to-imperative/trunk/library/Debug/Debug.cc

Timestamp:

Aug 1, 2006, 9:34:21 PM (14 years ago)

Author:

orlov

Message:

• Improved format of messages for a user.

File:

• to-imperative/trunk/library/Debug/Debug.cc (modified) (10 diffs)

to-imperative/trunk/library/Debug/Debug.cc

@@ -5 +5 @@
 #include <refal/Convert.hh>
 #include <refal/Box.hh>
+#include <refal/RF_Stack.hh>
 #include <refal/Static.hh>
 #include <refal/Table.hh>
 #include <refal/StdIO.hh>
-#include <refal/RF_Stack.hh>
+#include <refal/List.hh>
 
 namespace refal
@@ -669 +670 @@
           Expr _ve_name (_v_deref__lsplit__nv2, 0, _v_len__name2);
           Expr _ve_value (_v_deref__deref__lsplit__nv2, 0, _v_len__value2);
-          RF_CALL (StdIO::Print, _c_14, /*void*/);
-          RF_CALL (StdIO::Write, _ve_name, /*void*/);
-          RF_CALL (StdIO::Print, _c_15, /*void*/);
+          RF_CALL (StdIO::Print, (_c_15 + _ve_name + _c_14), /*void*/);
           RF_CALL (StdIO::WriteLN, _ve_value, /*void*/);
           goto _continue2;
@@ -796 +795 @@
         goto _block1__branch2;
       }
-      RF_lsplit (_ve_arg, 0, _ve_fname, _v_lsplit__arg);
-      for ( ; ; RF_iter(_ve_arg)++)
+      RF_rsplit (_ve_arg, 0, _v_rsplit__arg, _ve_column);
+      for ( ; ; RF_iter(_ve_arg)--)
       {
         {
@@ -804 +803 @@
             goto _block1__branch2;
           }
-          if ((_v_lsplit__arg.get_len () < 2))
+          if ((_v_rsplit__arg.get_len () < 2))
           {
             goto _block1__branch2;
           }
-          if (!_c_17.term_eq (_v_lsplit__arg, 0))
+          if (!_c_17.term_eq (_v_rsplit__arg, (_v_rsplit__arg.get_len () - 1)))
           {
             goto _continue1;
           }
-          Expr _v_subexpr__lsplit__arg (_v_lsplit__arg, 1, (_v_lsplit__arg.get_len () - 1));
-          RF_lsplit (_v_subexpr__lsplit__arg, 0, _ve_line, _v_lsplit__lsplit__arg);
-          for ( ; ; RF_iter(_v_subexpr__lsplit__arg)++)
+          Expr _v_subexpr__rsplit__arg (_v_rsplit__arg, 0, (_v_rsplit__arg.get_len () - 1));
+          RF_rsplit (_v_subexpr__rsplit__arg, 0, _v_rsplit__rsplit__arg, _ve_line);
+          for ( ; ; RF_iter(_v_subexpr__rsplit__arg)--)
           {
             {
-              if (!RF_iter(_v_subexpr__lsplit__arg))
-              {
-                goto _continue1;
-              }
-              uintptr_t _v_len1 = _v_lsplit__lsplit__arg.get_len ();
+              if (!RF_iter(_v_subexpr__rsplit__arg))
+              {
+                goto _continue1;
+              }
+              uintptr_t _v_len1 = _v_rsplit__rsplit__arg.get_len ();
               uintptr_t _v_len2 = 1;
               if ((_v_len1 < _v_len2))
@@ -827 +826 @@
                 goto _continue1;
               }
-              uintptr_t _v_len__column = (_v_len1 - _v_len2);
-              if (!_c_17.term_eq (_v_lsplit__lsplit__arg, 0))
+              uintptr_t _v_len__fname = (_v_len1 - _v_len2);
+              if (!_c_17.term_eq (_v_rsplit__rsplit__arg, _v_len__fname))
               {
                 goto _continue2;
               }
-              Expr _ve_column (_v_lsplit__lsplit__arg, 1, _v_len__column);
+              Expr _ve_fname (_v_rsplit__rsplit__arg, 0, _v_len__fname);
               Expr _v_To_m_Int1;
               if (!RF_CALL (Convert::To_m_Int, _ve_line, _v_To_m_Int1))
@@ -861 +860 @@
     uintptr_t _v_len___e__e_tmp_m_Debugrf_m_110_m_6 = (_v_len3 - _v_len4);
     Expr _ve__e__e_tmp_m_Debugrf_m_110_m_6 (_ve_arg, 0, _v_len___e__e_tmp_m_Debugrf_m_110_m_6);
-    RF_CALL (StdIO::PrintLN, _c_18, /*void*/);
+    RF_CALL (StdIO::Print, _c_18, /*void*/);
     Expr _v_Domain1;
     RF_CALL (Table::Domain, Breakpoints, _v_Domain1);
@@ -909 +908 @@
     Expr _v_Domain1;
     RF_CALL (Table::Domain, Break_m_Funcs, _v_Domain1);
-    RF_CALL (StdIO::WriteLN, _v_Domain1, /*void*/);
+    Expr _v_Concat1;
+    RF_CALL (List::Concat, _v_Domain1, _v_Concat1);
+    RF_CALL (StdIO::WriteLN, _v_Concat1, /*void*/);
   }
 _block1: {}
@@ -954 +955 @@
     Expr _v_Domain1;
     RF_CALL (Table::Domain, Break_m_Funcs, _v_Domain1);
-    RF_CALL (StdIO::WriteLN, _v_Domain1, /*void*/);
+    Expr _v_Concat1;
+    RF_CALL (List::Concat, _v_Domain1, _v_Concat1);
+    RF_CALL (StdIO::WriteLN, _v_Concat1, /*void*/);
   }
 _block1: {}
@@ -965 +968 @@
   RF_CALL (Table::Bind, (Ops, _c_27, _c_28), /*void*/);
   RF_CALL (Table::Bind, (Ops, _c_29, _c_30), /*void*/);
-  RF_CALL (Table::Bind, (Ops, _c_14, _c_31), /*void*/);
+  RF_CALL (Table::Bind, (Ops, _c_15, _c_31), /*void*/);
   RF_CALL (Table::Bind, (Ops, _c_32, _c_33), /*void*/);
   RF_CALL (Table::Bind, (Ops, _c_34, _c_35), /*void*/);
@@ -1317 +1320 @@
   _c_12 = Expr::create<Word>("[var-name | /*empty*/] prints value of `var-name` | all variables");
   _c_13 = Expr::create<Word>("No variable with name ");
-  _c_14 = Char::create_expr (L".");
-  _c_15 = Char::create_expr (L" : ");
+  _c_14 = Char::create_expr (L" : ");
+  _c_15 = Char::create_expr (L".");
   _c_16 = Expr::create<Word>("[file-name line column] sets breakpoint at specified position");
-  _c_17 = Expr (_c_15, 0, 1);
+  _c_17 = Expr (_c_14, 0, 1);
   _c_18 = Expr::create<Word>("Breakpoints: ");
   _c_19 = Expr::create<Word>("[file-name line column] removes breakpoint from specified position");