Changeset 3428

Timestamp:

Feb 25, 2008, 2:39:06 PM (13 years ago)

Author:

yura

Message:

• SVN properties.
• Suppress warnings: using Comparable<?> instead of Comparable.
• Fresh-generated compiler sources in Java.

Location:

to-imperative/trunk

Files:

• compiler (modified) (1 prop)
• java/compiler/org/refal/plus (modified) (1 prop)
• java/compiler/org/refal/plus/comp (modified) (1 prop)
• java/compiler/org/refal/plus/comp/ClassFormatReader.java (modified) (1 prop)
• java/compiler/org/refal/plus/compiler (modified) (1 prop)
• java/compiler/org/refal/plus/compiler/NativeJava.java (modified) (7 diffs, 2 props)
• java/compiler/org/refal/plus/compiler/rfp_as2as.java (modified) (55 diffs)
• java/compiler/org/refal/plus/compiler/rfp_asail.java (modified) (1 diff, 1 prop)
• java/compiler/org/refal/plus/compiler/rfp_asail2asail.java (modified) (58 diffs)
• java/compiler/org/refal/plus/compiler/rfp_asail_cpp.java (modified) (111 diffs)
• java/compiler/org/refal/plus/compiler/rfp_asail_java.java (modified) (109 diffs)
• java/compiler/org/refal/plus/compiler/rfp_asail_tpp.java (modified) (90 diffs)
• java/compiler/org/refal/plus/compiler/rfp_check.java (modified) (17 diffs)
• java/compiler/org/refal/plus/compiler/rfp_clashes.java (modified) (45 diffs)
• java/compiler/org/refal/plus/compiler/rfp_compile.java (modified) (145 diffs)
• java/compiler/org/refal/plus/compiler/rfp_const.java (modified) (24 diffs)
• java/compiler/org/refal/plus/compiler/rfp_debug.java (modified) (25 diffs)
• java/compiler/org/refal/plus/compiler/rfp_err.java (modified) (2 diffs)
• java/compiler/org/refal/plus/compiler/rfp_format.java (modified) (38 diffs)
• java/compiler/org/refal/plus/compiler/rfp_helper.java (modified) (7 diffs)
• java/compiler/org/refal/plus/compiler/rfp_lex.java (modified) (31 diffs)
• java/compiler/org/refal/plus/compiler/rfp_parse.java (modified) (128 diffs)
• java/compiler/org/refal/plus/compiler/rfp_src.java (modified) (14 diffs)
• java/compiler/org/refal/plus/compiler/rfp_vars.java (modified) (30 diffs)
• java/compiler/org/refal/plus/wrapgen (modified) (1 prop)
• java/compiler/org/refal/plus/wrapgen/RFIFile.java (modified) (6 diffs)
• java/compiler/org/refal/plus/wrapgen/WrapGen.java (modified) (14 diffs)
• java/runtime/org/refal/plus (modified) (1 prop)
• java/runtime/org/refal/plus/Native.java (modified) (1 diff, 2 props)
• java/runtime/refal/plus (modified) (1 prop)
• java/runtime/refal/plus/Bit.java (modified) (1 diff, 2 props)
• java/runtime/refal/plus/CppMangle.java (modified) (5 diffs)
• java/runtime/refal/plus/IndexedStream.java (modified) (1 diff)
• java/runtime/refal/plus/JavaMangle.java (modified) (5 diffs)
• java/runtime/refal/plus/Lexer.java (modified) (2 diffs)
• java/runtime/refal/plus/List.java (modified) (7 diffs)
• java/runtime/refal/plus/Stream.java (modified) (8 diffs)
• java/runtime/refal/plus/StreamErr.java (modified) (3 diffs)

to-imperative/trunk/compiler

@@ -1 @@
-*.s
-*.dep
-rfp*.cc
-NativeJava.cc
-rfp*.hh
-rfp*.class
-rfp*.java
+*.cc *.hh *.class *.java

@@ -1 @@
-*.s
-*.dep
-rfp*.cc
-NativeJava.cc
-rfp*.hh
-rfp*.class
-rfp*.java
+*.cc *.hh *.class *.java

to-imperative/trunk/java/compiler/org/refal/plus/compiler/NativeJava.java

@@ -12 +12 @@
   static  final Expr _c_2 = Expr.fromSequence (")");
   static  final Expr _c_3 = Expr.fromSequence ("(");
-  static  final Expr _c_4 = Expr.concat ((Comparable) Expr.empty, (Comparable) Expr.empty);
-  static  final Expr _c_5 = new Expr ((Comparable) Expr.empty);
+  static  final Expr _c_4 = Expr.concat ((Comparable<?>) Expr.empty, (Comparable<?>) Expr.empty);
+  static  final Expr _c_5 = new Expr ((Comparable<?>) Expr.empty);
   static  final Expr _c_6 = Expr.fromSequence ("static");
   static  final Expr _c_7 = new Expr (Symbol.newWord (""));
   static  final Expr _c_8 = Expr.fromSequence (".");
   static  final Expr _c_9 = Expr.fromSequence (",");
-  static  final Expr _c_11 = new Expr (Symbol.newWord ("Integer (int x, double);"));
-  static  final Expr _c_12 = new Expr (Symbol.newWord ("Integer Integer.toInteger (int x, double);"));
-  static  final Expr _c_13 = new Expr (Symbol.newWord ("static Integer java.lang.Integer.toInteger (int x, double);"));
+  static  final Expr _c_11 = new Expr (Symbol.newWord ("Integer (int x, double)"));
+  static  final Expr _c_12 = new Expr (Symbol.newWord ("Integer Integer.toInteger (int x, double)"));
+  static  final Expr _c_13 = new Expr (Symbol.newWord ("static Integer java.lang.Integer.toInteger (int x, double)"));
+  static  final Expr _c_14 = new Expr (Symbol.newWord ("Integer Integer.toInteger"));
+  static  final Expr _c_15 = new Expr (Symbol.newWord ("static Integer java.lang.Integer.toInteger"));
 
   @RefalFormat("$func? Whitespace t = ;")
@@ -143 +145 @@
       _exit1: _continue1: for ( ; ; _va_3.next ())
       {
-        Expr _ve__dollar_tmp_m_24_m_14 = _va_3.getLeft();
+        Expr _ve__dollar_tmp_m_23_m_14 = _va_3.getLeft();
         Expr _v_lsplit__arg = _va_3.getRight();
         if (!_va_3.isValid ())
@@ -155 +157 @@
           break _block1__branch1;
         }
-        int _v_len___dollar_tmp_m_24_m_23 = (_v_len1 - _v_len2);
+        int _v_len___dollar_tmp_m_23_m_23 = (_v_len1 - _v_len2);
         Expr _vt_term = Expr.empty;
         _vt_term = _v_lsplit__arg.subexpr (0, 1);
-        Expr _ve__dollar_tmp_m_24_m_23 = Expr.empty;
-        _ve__dollar_tmp_m_24_m_23 = _v_lsplit__arg.subexpr ((0 + 1), _v_len___dollar_tmp_m_24_m_23);
+        Expr _ve__dollar_tmp_m_23_m_23 = Expr.empty;
+        _ve__dollar_tmp_m_23_m_23 = _v_lsplit__arg.subexpr ((0 + 1), _v_len___dollar_tmp_m_23_m_23);
         _negation1: {
           if (!Whitespace (_vt_term))
@@ -184 +186 @@
       _exit1: _continue1: for ( ; ; _va_4.next ())
       {
-        Expr _ve__dollar_tmp_m_29_m_14 = _va_4.getLeft();
+        Expr _ve__dollar_tmp_m_28_m_14 = _va_4.getLeft();
         Expr _v_lsplit__arg = _va_4.getRight();
         if (!_va_4.isValid ())
@@ -196 +198 @@
           break _block1__branch1;
         }
-        int _v_len___dollar_tmp_m_29_m_23 = (_v_len1 - _v_len2);
+        int _v_len___dollar_tmp_m_28_m_23 = (_v_len1 - _v_len2);
         Expr _vt_term = Expr.empty;
         _vt_term = _v_lsplit__arg.subexpr (0, 1);
-        Expr _ve__dollar_tmp_m_29_m_23 = Expr.empty;
-        _ve__dollar_tmp_m_29_m_23 = _v_lsplit__arg.subexpr ((0 + 1), _v_len___dollar_tmp_m_29_m_23);
+        Expr _ve__dollar_tmp_m_28_m_23 = Expr.empty;
+        _ve__dollar_tmp_m_28_m_23 = _v_lsplit__arg.subexpr ((0 + 1), _v_len___dollar_tmp_m_28_m_23);
         if (!Whitespace (_vt_term))
         {
@@ -212 +214 @@
 
   @RefalFormat("$func DeclarationReader s = s s s s e;")
-  static public void DeclarationReader (Expr _vs_string, Result _v_res1, Result _v_res2, Result _v_res3, Result _v_res4, Result _v_res5) throws RefalException
-  {
-    Result _v_ToChars1 = new Result (Expr.empty);
-    refal.plus.Convert.ToChars (_vs_string, _v_ToChars1);
-    if (_v_ToChars1.getExpr ().length () < 2)
+  static public void DeclarationReader (Expr _vs_decl, Result _v_res1, Result _v_res2, Result _v_res3, Result _v_res4, Result _v_res5) throws RefalException
+  {
+    Result _ve_string = new Result (Expr.empty);
+    refal.plus.Convert.ToChars (_vs_decl, _ve_string);
+    _block1: {
+      _block1__branch1: {
+        if (_ve_string.getExpr ().length () < 2)
+        {
+          break _block1__branch1;
+        }
+        Expr.SplitIterator _va_5 = _ve_string.getExpr ().leftSplit(0);
+        _exit1: _continue1: for ( ; ; _va_5.next ())
+        {
+          Expr _ve_head = _va_5.getLeft();
+          Expr _v_lsplit__string = _va_5.getRight();
+          if (!_va_5.isValid ())
+          {
+            break _block1__branch1;
+          }
+          if (_v_lsplit__string.length () < 2)
+          {
+            break _block1__branch1;
+          }
+          if (!_c_3.termEquals (_v_lsplit__string, 0))
+          {
+            continue _continue1;
+          }
+          Expr _v_subexpr__lsplit__string = _v_lsplit__string.subexpr ((0 + 1), (_v_lsplit__string.length () - (0 + 1 + 0)));
+          Expr.SplitIterator _va_6 = _v_subexpr__lsplit__string.leftSplit(0);
+          _exit2: _continue2: for ( ; ; _va_6.next ())
+          {
+            Expr _ve_args = _va_6.getLeft();
+            Expr _v_lsplit__lsplit__string = _va_6.getRight();
+            if (!_va_6.isValid ())
+            {
+              continue _continue1;
+            }
+            int _v_len1 = _v_lsplit__lsplit__string.length ();
+            int _v_len2 = 1;
+            if (_v_len1 < _v_len2)
+            {
+              continue _continue1;
+            }
+            int _v_len___dollar_tmp_m_35_m_37 = (_v_len1 - _v_len2);
+            if (!_c_2.termEquals (_v_lsplit__lsplit__string, 0))
+            {
+              continue _continue2;
+            }
+            Expr _ve__dollar_tmp_m_35_m_37 = Expr.empty;
+            _ve__dollar_tmp_m_35_m_37 = _v_lsplit__lsplit__string.subexpr ((0 + 1), _v_len___dollar_tmp_m_35_m_37);
+            Result _gs_auxcall1 = new Result (Expr.empty);
+            Result _gs_auxcall2 = new Result (Expr.empty);
+            Result _gs_auxcall3 = new Result (Expr.empty);
+            Result _gs_auxcall4 = new Result (Expr.empty);
+            HeadReader (_ve_head, _gs_auxcall1, _gs_auxcall2, _gs_auxcall3, _gs_auxcall4);
+            Result _ge_auxcall5 = new Result (Expr.empty);
+            ArgsReader (_ve_args, _ge_auxcall5);
+            _v_res1.assign (_gs_auxcall1.getExpr ());
+            _v_res2.assign (_gs_auxcall2.getExpr ());
+            _v_res3.assign (_gs_auxcall3.getExpr ());
+            _v_res4.assign (_gs_auxcall4.getExpr ());
+            _v_res5.assign (new Expr ((Comparable<?>) _ge_auxcall5.getExpr ()));
+            break _exit2;
+          }
+          break _exit1;
+        }
+        break _block1;
+      }
+      HeadReader (_ve_string.getExpr (), _v_res1, _v_res2, _v_res3, _v_res4);
+      _v_res5.assign (Expr.empty);
+    }
+  }
+
+  @RefalFormat("$func HeadReader e = s s s s;")
+  static  void HeadReader (Expr _ve_head, Result _v_res1, Result _v_res2, Result _v_res3, Result _v_res4) throws RefalException
+  {
+    Result _ve_nws1 = new Result (Expr.empty);
+    Result _ge_head__0 = new Result (Expr.empty);
+    GetWhileNotWhitespace (_ve_head, _ve_nws1, _ge_head__0);
+    Result _ve_nws2 = new Result (Expr.empty);
+    GetWhileNotWhitespace (_ge_head__0.getExpr (), _ve_nws2, _ge_head__0);
+    Result _ve_nws3 = new Result (Expr.empty);
+    GetWhileNotWhitespace (_ge_head__0.getExpr (), _ve_nws3, _ge_head__0);
+    if (!Whitespaces (_ge_head__0.getExpr ()))
     {
-      throw new RefalException ("org.refal.plus.compiler.NativeJava", "DeclarationReader", "Unexpected fail");
-    }
-    Expr.SplitIterator _va_5 = _v_ToChars1.getExpr ().leftSplit(0);
-    _exit1: _continue1: for ( ; ; _va_5.next ())
+      throw new RefalException ("org.refal.plus.compiler.NativeJava", "HeadReader", "Unexpected fail");
+    }
+    Expr _ve_static = Expr.empty;
+    Expr _ve_resType = Expr.empty;
+    Expr _ve_methodname = Expr.empty;
+    _block1: {
+      _block1__branch1: {
+        Expr _v_compose1 = Expr.getConcatenator ().toRight ((Comparable<?>) _ve_nws1.getExpr ()).toRight ((Comparable<?>) _ve_nws2.getExpr ()).toRight ((Comparable<?>) _ve_nws3.getExpr ()).yield ();
+        if (_v_compose1.isSymbolAt (0))
+        {
+          break _block1__branch1;
+        }
+        Expr _v_deref__compose1 = (Expr) _v_compose1.at (0);
+        int _v_len1 = _v_deref__compose1.length ();
+        int _v_len2 = 0;
+        if (_v_len1 < _v_len2)
+        {
+          break _block1__branch1;
+        }
+        int _v_len__methodname__2 = (_v_len1 - _v_len2);
+        if (!_c_4.equals (_v_compose1, (0 + 1)))
+        {
+          break _block1__branch1;
+        }
+        Expr _ge_methodname__2 = Expr.empty;
+        _ge_methodname__2 = _v_deref__compose1.subexpr (0, _v_len__methodname__2);
+        _ve_static = Expr.empty;
+        _ve_resType = Expr.empty;
+        _ve_methodname = _ge_methodname__2;
+        break _block1;
+      }
+      _block1__branch2: {
+        Expr _v_compose2 = Expr.getConcatenator ().toRight ((Comparable<?>) _ve_nws1.getExpr ()).toRight ((Comparable<?>) _ve_nws2.getExpr ()).toRight ((Comparable<?>) _ve_nws3.getExpr ()).yield ();
+        if (_v_compose2.isSymbolAt (0))
+        {
+          break _block1__branch2;
+        }
+        if (_v_compose2.isSymbolAt ((0 + 1)))
+        {
+          break _block1__branch2;
+        }
+        Expr _v_deref__compose2 = (Expr) _v_compose2.at (0);
+        Expr _v_deref__compose22 = (Expr) _v_compose2.at ((0 + 1));
+        int _v_len3 = _v_deref__compose2.length ();
+        int _v_len4 = 0;
+        if (_v_len3 < _v_len4)
+        {
+          break _block1__branch2;
+        }
+        int _v_len__resType__2 = (_v_len3 - _v_len4);
+        int _v_len5 = _v_deref__compose22.length ();
+        int _v_len6 = 0;
+        if (_v_len5 < _v_len6)
+        {
+          break _block1__branch2;
+        }
+        int _v_len__methodname__22 = (_v_len5 - _v_len6);
+        if (!_c_5.termEquals (_v_compose2, (0 + 1 + 1)))
+        {
+          break _block1__branch2;
+        }
+        Expr _ge_resType__2 = Expr.empty;
+        _ge_resType__2 = _v_deref__compose2.subexpr (0, _v_len__resType__2);
+        Expr _ge_methodname__2 = Expr.empty;
+        _ge_methodname__2 = _v_deref__compose22.subexpr (0, _v_len__methodname__22);
+        _ve_static = Expr.empty;
+        _ve_resType = _ge_resType__2;
+        _ve_methodname = _ge_methodname__2;
+        break _block1;
+      }
+      Expr _v_compose3 = Expr.getConcatenator ().toRight ((Comparable<?>) _ve_nws1.getExpr ()).toRight ((Comparable<?>) _ve_nws2.getExpr ()).toRight ((Comparable<?>) _ve_nws3.getExpr ()).yield ();
+      if (_v_compose3.isSymbolAt (0))
+      {
+        throw new RefalException ("org.refal.plus.compiler.NativeJava", "HeadReader", "Unexpected fail");
+      }
+      if (_v_compose3.isSymbolAt ((0 + 1)))
+      {
+        throw new RefalException ("org.refal.plus.compiler.NativeJava", "HeadReader", "Unexpected fail");
+      }
+      if (_v_compose3.isSymbolAt ((0 + 1 + 1)))
+      {
+        throw new RefalException ("org.refal.plus.compiler.NativeJava", "HeadReader", "Unexpected fail");
+      }
+      Expr _v_deref__compose3 = (Expr) _v_compose3.at (0);
+      Expr _v_deref__compose32 = (Expr) _v_compose3.at ((0 + 1));
+      Expr _v_deref__compose33 = (Expr) _v_compose3.at ((0 + 1 + 1));
+      int _v_len7 = _v_deref__compose3.length ();
+      int _v_len8 = 0;
+      if (_v_len7 < _v_len8)
+      {
+        throw new RefalException ("org.refal.plus.compiler.NativeJava", "HeadReader", "Unexpected fail");
+      }
+      int _v_len__static__2 = (_v_len7 - _v_len8);
+      int _v_len9 = _v_deref__compose32.length ();
+      int _v_len10 = 0;
+      if (_v_len9 < _v_len10)
+      {
+        throw new RefalException ("org.refal.plus.compiler.NativeJava", "HeadReader", "Unexpected fail");
+      }
+      int _v_len__resType__22 = (_v_len9 - _v_len10);
+      int _v_len11 = _v_deref__compose33.length ();
+      int _v_len12 = 0;
+      if (_v_len11 < _v_len12)
+      {
+        throw new RefalException ("org.refal.plus.compiler.NativeJava", "HeadReader", "Unexpected fail");
+      }
+      int _v_len__methodname__23 = (_v_len11 - _v_len12);
+      Expr _ge_static__2 = Expr.empty;
+      _ge_static__2 = _v_deref__compose3.subexpr (0, _v_len__static__2);
+      Expr _ge_resType__2 = Expr.empty;
+      _ge_resType__2 = _v_deref__compose32.subexpr (0, _v_len__resType__22);
+      Expr _ge_methodname__2 = Expr.empty;
+      _ge_methodname__2 = _v_deref__compose33.subexpr (0, _v_len__methodname__23);
+      _ve_static = _ge_static__2;
+      _ve_resType = _ge_resType__2;
+      _ve_methodname = _ge_methodname__2;
+    }
+    _block2: {
+      _block2__branch1: {
+        if (_ve_static.length () != 0)
+        {
+          break _block2__branch1;
+        }
+        break _block2;
+      }
+      if (_ve_static.length () != 6)
+      {
+        throw new RefalException ("org.refal.plus.compiler.NativeJava", "HeadReader", "Unexpected fail");
+      }
+      if (!_c_6.equals (_ve_static, 0))
+      {
+        throw new RefalException ("org.refal.plus.compiler.NativeJava", "HeadReader", "Unexpected fail");
+      }
+    }
+    Result _vs_static = new Result (Expr.empty);
+    refal.plus.Convert.ToWord (_ve_static, _vs_static);
+    Result _vs_resType = new Result (Expr.empty);
+    refal.plus.Convert.ToWord (_ve_resType, _vs_resType);
+    Expr _vs_className = Expr.empty;
+    Expr _vs_methodName = Expr.empty;
+    _block3: {
+      _block3__branch1: {
+        if (!_vs_resType.getExpr ().termEquals (_c_7, 0))
+        {
+          break _block3__branch1;
+        }
+        Result _gs_auxcall1 = new Result (Expr.empty);
+        refal.plus.Convert.ToWord (_ve_methodname, _gs_auxcall1);
+        _vs_className = _gs_auxcall1.getExpr ();
+        _vs_methodName = _c_7;
+        break _block3;
+      }
+      if (_ve_methodname.length () < 1)
+      {
+        throw new RefalException ("org.refal.plus.compiler.NativeJava", "HeadReader", "Unexpected fail");
+      }
+      Expr.SplitIterator _va_7 = _ve_methodname.rightSplit(0);
+      _exit1: _continue1: for ( ; ; _va_7.prev ())
+      {
+        Expr _v_rsplit__methodname = _va_7.getLeft();
+        Expr _ve_methodname1 = _va_7.getRight();
+        if (!_va_7.isValid ())
+        {
+          throw new RefalException ("org.refal.plus.compiler.NativeJava", "HeadReader", "Unexpected fail");
+        }
+        int _v_len13 = _v_rsplit__methodname.length ();
+        int _v_len14 = 1;
+        if (_v_len13 < _v_len14)
+        {
+          throw new RefalException ("org.refal.plus.compiler.NativeJava", "HeadReader", "Unexpected fail");
+        }
+        int _v_len__classname = (_v_len13 - _v_len14);
+        if (!_c_8.termEquals (_v_rsplit__methodname, (0 + _v_len__classname)))
+        {
+          continue _continue1;
+        }
+        Expr _ve_classname = Expr.empty;
+        _ve_classname = _v_rsplit__methodname.subexpr (0, _v_len__classname);
+        Result _gs_auxcall2 = new Result (Expr.empty);
+        refal.plus.Convert.ToWord (_ve_classname, _gs_auxcall2);
+        Result _va_8 = new Result ();
+        refal.plus.Convert.ToWord (_ve_methodname1, _va_8);
+        _vs_methodName = _va_8.getExpr ();
+        _vs_className = _gs_auxcall2.getExpr ();
+        break _exit1;
+      }
+    }
+    _v_res1.assign (_vs_static.getExpr ());
+    _v_res2.assign (_vs_resType.getExpr ());
+    _v_res3.assign (_vs_className);
+    _v_res4.assign (_vs_methodName);
+  }
+
+  @RefalFormat("$func ArgsReader e = e;")
+  static  void ArgsReader (Expr _ve_args, Result _v_res1) throws RefalException
+  {
+    Expr _ve_argTypes = Expr.empty;
+    Expr _ge_args__0 = _ve_args;
+    _exit__iter1: for ( ; ; )
     {
-      Expr _ve_head = _va_5.getLeft();
-      Expr _v_lsplit__ToChars1 = _va_5.getRight();
-      if (!_va_5.isValid ())
-      {
-        throw new RefalException ("org.refal.plus.compiler.NativeJava", "DeclarationReader", "Unexpected fail");
-      }
-      if (_v_lsplit__ToChars1.length () < 2)
-      {
-        throw new RefalException ("org.refal.plus.compiler.NativeJava", "DeclarationReader", "Unexpected fail");
-      }
-      if (!_c_3.termEquals (_v_lsplit__ToChars1, 0))
-      {
-        continue _continue1;
-      }
-      Expr _v_subexpr__lsplit__ToChars1 = _v_lsplit__ToChars1.subexpr ((0 + 1), (_v_lsplit__ToChars1.length () - (0 + 1 + 0)));
-      Expr.SplitIterator _va_6 = _v_subexpr__lsplit__ToChars1.leftSplit(0);
-      _exit2: _continue2: for ( ; ; _va_6.next ())
-      {
-        Expr _ve_args = _va_6.getLeft();
-        Expr _v_lsplit__lsplit__ToChars1 = _va_6.getRight();
-        if (!_va_6.isValid ())
-        {
-          continue _continue1;
-        }
-        int _v_len1 = _v_lsplit__lsplit__ToChars1.length ();
-        int _v_len2 = 1;
-        if (_v_len1 < _v_len2)
-        {
-          continue _continue1;
-        }
-        int _v_len___dollar_tmp_m_33_m_47 = (_v_len1 - _v_len2);
-        if (!_c_2.termEquals (_v_lsplit__lsplit__ToChars1, 0))
-        {
-          continue _continue2;
-        }
-        Expr _ve__dollar_tmp_m_33_m_47 = Expr.empty;
-        _ve__dollar_tmp_m_33_m_47 = _v_lsplit__lsplit__ToChars1.subexpr ((0 + 1), _v_len___dollar_tmp_m_33_m_47);
-        Result _ve_nws1 = new Result (Expr.empty);
-        Result _gedd_head1 = new Result (_ve_head);
-        GetWhileNotWhitespace (_gedd_head1.getExpr (), _ve_nws1, _gedd_head1);
-        Result _ve_nws2 = new Result (Expr.empty);
-        GetWhileNotWhitespace (_gedd_head1.getExpr (), _ve_nws2, _gedd_head1);
-        Result _ve_nws3 = new Result (Expr.empty);
-        GetWhileNotWhitespace (_gedd_head1.getExpr (), _ve_nws3, _gedd_head1);
-        if (!Whitespaces (_gedd_head1.getExpr ()))
-        {
-          throw new RefalException ("org.refal.plus.compiler.NativeJava", "DeclarationReader", "Unexpected fail");
-        }
-        Expr _ve_static = Expr.empty;
-        Expr _ve_resType = Expr.empty;
-        Expr _ve_methodname = Expr.empty;
-        _block1: {
-          _block1__branch1: {
-            Expr _v_compose1 = Expr.getConcatenator ().toRight ((Comparable) _ve_nws1.getExpr ()).toRight ((Comparable) _ve_nws2.getExpr ()).toRight ((Comparable) _ve_nws3.getExpr ()).yield ();
-            if (_v_compose1.isSymbolAt (0))
-            {
-              break _block1__branch1;
-            }
-            Expr _v_deref__compose1 = (Expr) _v_compose1.at (0);
-            int _v_len3 = _v_deref__compose1.length ();
-            int _v_len4 = 0;
-            if (_v_len3 < _v_len4)
-            {
-              break _block1__branch1;
-            }
-            int _v_len__methodname__2 = (_v_len3 - _v_len4);
-            if (!_c_4.equals (_v_compose1, (0 + 1)))
-            {
-              break _block1__branch1;
-            }
-            Expr _ge_methodname__2 = Expr.empty;
-            _ge_methodname__2 = _v_deref__compose1.subexpr (0, _v_len__methodname__2);
-            _ve_static = Expr.empty;
-            _ve_resType = Expr.empty;
-            _ve_methodname = _ge_methodname__2;
-            break _block1;
-          }
-          _block1__branch2: {
-            Expr _v_compose2 = Expr.getConcatenator ().toRight ((Comparable) _ve_nws1.getExpr ()).toRight ((Comparable) _ve_nws2.getExpr ()).toRight ((Comparable) _ve_nws3.getExpr ()).yield ();
-            if (_v_compose2.isSymbolAt (0))
-            {
-              break _block1__branch2;
-            }
-            if (_v_compose2.isSymbolAt ((0 + 1)))
-            {
-              break _block1__branch2;
-            }
-            Expr _v_deref__compose2 = (Expr) _v_compose2.at (0);
-            Expr _v_deref__compose22 = (Expr) _v_compose2.at ((0 + 1));
-            int _v_len5 = _v_deref__compose22.length ();
-            int _v_len6 = 0;
-            if (_v_len5 < _v_len6)
-            {
-              break _block1__branch2;
-            }
-            int _v_len__methodname__22 = (_v_len5 - _v_len6);
-            int _v_len7 = _v_deref__compose2.length ();
-            int _v_len8 = 0;
-            if (_v_len7 < _v_len8)
-            {
-              break _block1__branch2;
-            }
-            int _v_len__resType__2 = (_v_len7 - _v_len8);
-            if (!_c_5.termEquals (_v_compose2, (0 + 1 + 1)))
-            {
-              break _block1__branch2;
-            }
-            Expr _ge_resType__2 = Expr.empty;
-            _ge_resType__2 = _v_deref__compose2.subexpr (0, _v_len__resType__2);
-            Expr _ge_methodname__2 = Expr.empty;
-            _ge_methodname__2 = _v_deref__compose22.subexpr (0, _v_len__methodname__22);
-            _ve_static = Expr.empty;
-            _ve_resType = _ge_resType__2;
-            _ve_methodname = _ge_methodname__2;
-            break _block1;
-          }
-          Expr _v_compose3 = Expr.getConcatenator ().toRight ((Comparable) _ve_nws1.getExpr ()).toRight ((Comparable) _ve_nws2.getExpr ()).toRight ((Comparable) _ve_nws3.getExpr ()).yield ();
-          if (_v_compose3.isSymbolAt (0))
-          {
-            throw new RefalException ("org.refal.plus.compiler.NativeJava", "DeclarationReader", "Unexpected fail");
-          }
-          if (_v_compose3.isSymbolAt ((0 + 1)))
-          {
-            throw new RefalException ("org.refal.plus.compiler.NativeJava", "DeclarationReader", "Unexpected fail");
-          }
-          if (_v_compose3.isSymbolAt ((0 + 1 + 1)))
-          {
-            throw new RefalException ("org.refal.plus.compiler.NativeJava", "DeclarationReader", "Unexpected fail");
-          }
-          Expr _v_deref__compose3 = (Expr) _v_compose3.at (0);
-          Expr _v_deref__compose32 = (Expr) _v_compose3.at ((0 + 1));
-          Expr _v_deref__compose33 = (Expr) _v_compose3.at ((0 + 1 + 1));
-          int _v_len9 = _v_deref__compose3.length ();
-          int _v_len10 = 0;
-          if (_v_len9 < _v_len10)
-          {
-            throw new RefalException ("org.refal.plus.compiler.NativeJava", "DeclarationReader", "Unexpected fail");
-          }
-          int _v_len__static__2 = (_v_len9 - _v_len10);
-          int _v_len11 = _v_deref__compose33.length ();
-          int _v_len12 = 0;
-          if (_v_len11 < _v_len12)
-          {
-            throw new RefalException ("org.refal.plus.compiler.NativeJava", "DeclarationReader", "Unexpected fail");
-          }
-          int _v_len__methodname__23 = (_v_len11 - _v_len12);
-          int _v_len13 = _v_deref__compose32.length ();
-          int _v_len14 = 0;
-          if (_v_len13 < _v_len14)
-          {
-            throw new RefalException ("org.refal.plus.compiler.NativeJava", "DeclarationReader", "Unexpected fail");
-          }
-          int _v_len__resType__22 = (_v_len13 - _v_len14);
-          Expr _ge_static__2 = Expr.empty;
-          _ge_static__2 = _v_deref__compose3.subexpr (0, _v_len__static__2);
-          Expr _ge_resType__2 = Expr.empty;
-          _ge_resType__2 = _v_deref__compose32.subexpr (0, _v_len__resType__22);
-          Expr _ge_methodname__2 = Expr.empty;
-          _ge_methodname__2 = _v_deref__compose33.subexpr (0, _v_len__methodname__23);
-          _ve_static = _ge_static__2;
-          _ve_resType = _ge_resType__2;
-          _ve_methodname = _ge_methodname__2;
-        }
-        _block2: {
-          _block2__branch1: {
-            if (_ve_static.length () != 0)
+      _iter1: {
+        if (!Whitespaces (_ge_args__0))
+        {
+          break _iter1;
+        }
+        _v_res1.assign (_ve_argTypes);
+        break _exit__iter1;
+      }
+      Expr _ve_arg = Expr.empty;
+      Expr _ve_tail = Expr.empty;
+      _block2: {
+        _block2__branch1: {
+          if (_ge_args__0.length () < 1)
+          {
+            break _block2__branch1;
+          }
+          Expr.SplitIterator _va_9 = _ge_args__0.leftSplit(0);
+          _exit1: _continue1: for ( ; ; _va_9.next ())
+          {
+            Expr _ge_arg__4 = _va_9.getLeft();
+            Expr _v_lsplit__args__0 = _va_9.getRight();
+            if (!_va_9.isValid ())
             {
               break _block2__branch1;
             }
-            break _block2;
-          }
-          if (_ve_static.length () != 6)
-          {
-            throw new RefalException ("org.refal.plus.compiler.NativeJava", "DeclarationReader", "Unexpected fail");
-          }
-          if (!_c_6.equals (_ve_static, 0))
-          {
-            throw new RefalException ("org.refal.plus.compiler.NativeJava", "DeclarationReader", "Unexpected fail");
-          }
-        }
-        Result _vs_static = new Result (Expr.empty);
-        refal.plus.Convert.ToWord (_ve_static, _vs_static);
-        Result _vs_resType = new Result (Expr.empty);
-        refal.plus.Convert.ToWord (_ve_resType, _vs_resType);
-        Expr _vs_className = Expr.empty;
-        Expr _vs_methodName = Expr.empty;
-        _block3: {
-          _block3__branch1: {
-            if (!_vs_resType.getExpr ().termEquals (_c_7, 0))
-            {
-              break _block3__branch1;
-            }
-            Result _gs_auxcall1 = new Result (Expr.empty);
-            refal.plus.Convert.ToWord (_ve_methodname, _gs_auxcall1);
-            _vs_className = _gs_auxcall1.getExpr ();
-            _vs_methodName = _c_7;
-            break _block3;
-          }
-          if (_ve_methodname.length () < 1)
-          {
-            throw new RefalException ("org.refal.plus.compiler.NativeJava", "DeclarationReader", "Unexpected fail");
-          }
-          Expr.SplitIterator _va_7 = _ve_methodname.rightSplit(0);
-          _exit3: _continue3: for ( ; ; _va_7.prev ())
-          {
-            Expr _v_rsplit__methodname = _va_7.getLeft();
-            Expr _ve_methodname1 = _va_7.getRight();
-            if (!_va_7.isValid ())
-            {
-              throw new RefalException ("org.refal.plus.compiler.NativeJava", "DeclarationReader", "Unexpected fail");
-            }
-            int _v_len15 = _v_rsplit__methodname.length ();
-            int _v_len16 = 1;
-            if (_v_len15 < _v_len16)
-            {
-              throw new RefalException ("org.refal.plus.compiler.NativeJava", "DeclarationReader", "Unexpected fail");
-            }
-            int _v_len__classname = (_v_len15 - _v_len16);
-            if (!_c_8.termEquals (_v_rsplit__methodname, (0 + _v_len__classname)))
+            int _v_len1 = _v_lsplit__args__0.length ();
+            int _v_len2 = 1;
+            if (_v_len1 < _v_len2)
+            {
+              break _block2__branch1;
+            }
+            int _v_len__tail__4 = (_v_len1 - _v_len2);
+            if (!_c_9.termEquals (_v_lsplit__args__0, 0))
+            {
+              continue _continue1;
+            }
+            Expr _ge_tail__4 = Expr.empty;
+            _ge_tail__4 = _v_lsplit__args__0.subexpr ((0 + 1), _v_len__tail__4);
+            _ve_arg = _ge_arg__4;
+            _ve_tail = _ge_tail__4;
+            break _exit1;
+          }
+          break _block2;
+        }
+        int _v_len3 = _ge_args__0.length ();
+        int _v_len4 = 0;
+        if (_v_len3 < _v_len4)
+        {
+          throw new RefalException ("org.refal.plus.compiler.NativeJava", "ArgsReader", "Unexpected fail");
+        }
+        int _v_len___dollar_tmp_m_62_m_8 = (_v_len3 - _v_len4);
+        Expr _ve__dollar_tmp_m_62_m_8 = Expr.empty;
+        _ve__dollar_tmp_m_62_m_8 = _ge_args__0.subexpr (0, _v_len___dollar_tmp_m_62_m_8);
+        _ve_arg = _ge_args__0;
+        _ve_tail = Expr.empty;
+      }
+      if (_ve_arg.length () < 0)
+      {
+        throw new RefalException ("org.refal.plus.compiler.NativeJava", "ArgsReader", "Unexpected fail");
+      }
+      Expr.SplitIterator _va_10 = _ve_arg.rightSplit(0);
+      _exit2: _continue2: for ( ; ; _va_10.prev ())
+      {
+        Expr _v_rsplit__arg = _va_10.getLeft();
+        Expr _ve_ws13 = _va_10.getRight();
+        if (!_va_10.isValid ())
+        {
+          throw new RefalException ("org.refal.plus.compiler.NativeJava", "ArgsReader", "Unexpected fail");
+        }
+        if (_v_rsplit__arg.length () < 0)
+        {
+          throw new RefalException ("org.refal.plus.compiler.NativeJava", "ArgsReader", "Unexpected fail");
+        }
+        Expr.SplitIterator _va_11 = _v_rsplit__arg.rightSplit(0);
+        _exit3: _continue3: for ( ; ; _va_11.prev ())
+        {
+          Expr _v_rsplit__rsplit__arg = _va_11.getLeft();
+          Expr _ve_argName = _va_11.getRight();
+          if (!_va_11.isValid ())
+          {
+            continue _continue2;
+          }
+          if (_v_rsplit__rsplit__arg.length () < 0)
+          {
+            continue _continue2;
+          }
+          Expr.SplitIterator _va_12 = _v_rsplit__rsplit__arg.rightSplit(0);
+          _exit4: _continue4: for ( ; ; _va_12.prev ())
+          {
+            Expr _v_rsplit__rsplit__rsplit__arg = _va_12.getLeft();
+            Expr _ve_ws12 = _va_12.getRight();
+            if (!_va_12.isValid ())
             {
               continue _continue3;
             }
-            Expr _ve_classname = Expr.empty;
-            _ve_classname = _v_rsplit__methodname.subexpr (0, _v_len__classname);
-            Result _gs_auxcall2 = new Result (Expr.empty);
-            refal.plus.Convert.ToWord (_ve_classname, _gs_auxcall2);
-            Result _va_8 = new Result ();
-            refal.plus.Convert.ToWord (_ve_methodname1, _va_8);
-            _vs_methodName = _va_8.getExpr ();
-            _vs_className = _gs_auxcall2.getExpr ();
-            break _exit3;
-          }
-        }
-        Expr _ve_argTypes = Expr.empty;
-        Expr _ge_args__2 = _ve_args;
-        _exit__iter1: for ( ; ; )
-        {
-          _iter1: {
-            if (!Whitespaces (_ge_args__2))
-            {
-              break _iter1;
-            }
-            _v_res1.assign (_vs_static.getExpr ());
-            _v_res2.assign (_vs_resType.getExpr ());
-            _v_res3.assign (_vs_className);
-            _v_res4.assign (_vs_methodName);
-            _v_res5.assign (_ve_argTypes);
-            break _exit__iter1;
-          }
-          Expr _ve_arg = Expr.empty;
-          Expr _ve_tail = Expr.empty;
-          _block5: {
-            _block5__branch1: {
-              if (_ge_args__2.length () < 1)
-              {
-                break _block5__branch1;
-              }
-              Expr.SplitIterator _va_9 = _ge_args__2.leftSplit(0);
-              _exit4: _continue4: for ( ; ; _va_9.next ())
-              {
-                Expr _ge_arg__6 = _va_9.getLeft();
-                Expr _v_lsplit__args__2 = _va_9.getRight();
-                if (!_va_9.isValid ())
-                {
-                  break _block5__branch1;
-                }
-                int _v_len17 = _v_lsplit__args__2.length ();
-                int _v_len18 = 1;
-                if (_v_len17 < _v_len18)
-                {
-                  break _block5__branch1;
-                }
-                int _v_len__tail__6 = (_v_len17 - _v_len18);
-                if (!_c_9.termEquals (_v_lsplit__args__2, 0))
-                {
-                  continue _continue4;
-                }
-                Expr _ge_tail__6 = Expr.empty;
-                _ge_tail__6 = _v_lsplit__args__2.subexpr ((0 + 1), _v_len__tail__6);
-                _ve_arg = _ge_arg__6;
-                _ve_tail = _ge_tail__6;
-                break _exit4;
-              }
-              break _block5;
-            }
-            int _v_len19 = _ge_args__2.length ();
-            int _v_len20 = 0;
-            if (_v_len19 < _v_len20)
-            {
-              throw new RefalException ("org.refal.plus.compiler.NativeJava", "DeclarationReader", "Unexpected fail");
-            }
-            int _v_len___dollar_tmp_m_53_m_8 = (_v_len19 - _v_len20);
-            Expr _ve__dollar_tmp_m_53_m_8 = Expr.empty;
-            _ve__dollar_tmp_m_53_m_8 = _ge_args__2.subexpr (0, _v_len___dollar_tmp_m_53_m_8);
-            _ve_arg = _ge_args__2;
-            _ve_tail = Expr.empty;
-          }
-          if (_ve_arg.length () < 0)
-          {
-            throw new RefalException ("org.refal.plus.compiler.NativeJava", "DeclarationReader", "Unexpected fail");
-          }
-          Expr.SplitIterator _va_10 = _ve_arg.rightSplit(0);
-          _exit5: _continue5: for ( ; ; _va_10.prev ())
-          {
-            Expr _v_rsplit__arg = _va_10.getLeft();
-            Expr _ve_ws13 = _va_10.getRight();
-            if (!_va_10.isValid ())
-            {
-              throw new RefalException ("org.refal.plus.compiler.NativeJava", "DeclarationReader", "Unexpected fail");
-            }
-            if (_v_rsplit__arg.length () < 0)
-            {
-              throw new RefalException ("org.refal.plus.compiler.NativeJava", "DeclarationReader", "Unexpected fail");
-            }
-            Expr.SplitIterator _va_11 = _v_rsplit__arg.rightSplit(0);
-            _exit6: _continue6: for ( ; ; _va_11.prev ())
-            {
-              Expr _v_rsplit__rsplit__arg = _va_11.getLeft();
-              Expr _ve_argName = _va_11.getRight();
-              if (!_va_11.isValid ())
+            if (_v_rsplit__rsplit__rsplit__arg.length () < 0)
+            {
+              continue _continue3;
+            }
+            Expr.SplitIterator _va_13 = _v_rsplit__rsplit__rsplit__arg.rightSplit(0);
+            _exit5: _continue5: for ( ; ; _va_13.prev ())
+            {
+              Expr _ve_ws11 = _va_13.getLeft();
+              Expr _ve_argType = _va_13.getRight();
+              if (!_va_13.isValid ())
+              {
+                continue _continue4;
+              }
+              if (_ve_ws11.length () < 0)
+              {
+                continue _continue4;
+              }
+              if (!NoWhitespaces (_ve_argType))
               {
                 continue _continue5;
               }
-              if (_v_rsplit__rsplit__arg.length () < 0)
+              if (!NoWhitespaces (_ve_argName))
               {
                 continue _continue5;
               }
-              Expr.SplitIterator _va_12 = _v_rsplit__rsplit__arg.rightSplit(0);
-              _exit7: _continue7: for ( ; ; _va_12.prev ())
-              {
-                Expr _v_rsplit__rsplit__rsplit__arg = _va_12.getLeft();
-                Expr _ve_ws12 = _va_12.getRight();
-                if (!_va_12.isValid ())
-                {
-                  continue _continue6;
-                }
-                if (_v_rsplit__rsplit__rsplit__arg.length () < 0)
-                {
-                  continue _continue6;
-                }
-                Expr.SplitIterator _va_13 = _v_rsplit__rsplit__rsplit__arg.rightSplit(0);
-                _exit8: _continue8: for ( ; ; _va_13.prev ())
-                {
-                  Expr _ve_ws11 = _va_13.getLeft();
-                  Expr _ve_argType = _va_13.getRight();
-                  if (!_va_13.isValid ())
-                  {
-                    continue _continue7;
-                  }
-                  if (_ve_ws11.length () < 0)
-                  {
-                    continue _continue7;
-                  }
-                  if (!NoWhitespaces (_ve_argType))
-                  {
-                    continue _continue8;
-                  }
-                  if (!NoWhitespaces (_ve_argName))
-                  {
-                    continue _continue8;
-                  }
-                  if (!Whitespaces (_ve_ws11))
-                  {
-                    continue _continue8;
-                  }
-                  if (!Whitespaces (_ve_ws12))
-                  {
-                    continue _continue8;
-                  }
-                  if (!Whitespaces (_ve_ws13))
-                  {
-                    continue _continue8;
-                  }
-                  Result _gs_auxcall3 = new Result (Expr.empty);
-                  refal.plus.Convert.ToWord (_ve_argType, _gs_auxcall3);
-                  _ve_argTypes = Expr.concat (_ve_argTypes, _gs_auxcall3.getExpr ());
-                  _ge_args__2 = _ve_tail;
-                  break _exit8;
-                }
-                break _exit7;
-              }
-              break _exit6;
-            }
-            break _exit5;
-          }
+              if (!Whitespaces (_ve_ws11))
+              {
+                continue _continue5;
+              }
+              if (!Whitespaces (_ve_ws12))
+              {
+                continue _continue5;
+              }
+              if (!Whitespaces (_ve_ws13))
+              {
+                continue _continue5;
+              }
+              Result _gs_auxcall1 = new Result (Expr.empty);
+              refal.plus.Convert.ToWord (_ve_argType, _gs_auxcall1);
+              _ve_argTypes = Expr.concat (_ve_argTypes, _gs_auxcall1.getExpr ());
+              _ge_args__0 = _ve_tail;
+              break _exit5;
+            }
+            break _exit4;
+          }
+          break _exit3;
         }
         break _exit2;
       }
-      break _exit1;
     }
   }
@@ -635 +666 @@
     PrintDeclReader (_c_12);
     PrintDeclReader (_c_13);
+    PrintDeclReader (_c_14);
+    PrintDeclReader (_c_15);
     _v_res1.assign (Expr.empty);
   }

to-imperative/trunk/java/compiler/org/refal/plus/compiler/rfp_as2as.java

@@ -11 +11 @@
   static  final Expr _c_2 = new Expr (Symbol.newWord ("BRANCH"));
   static  final Expr _c_3 = new Expr (Symbol.newWord ("DBG"));
-  static  final Expr _c_28 = Expr.concat (Symbol.newWord ("RESULT"), (Comparable) _c_1);
+  static  final Expr _c_28 = Expr.concat (Symbol.newWord ("RESULT"), (Comparable<?>) _c_1);
   static  final Expr _c_4 = _c_28.subexpr (0, 1);
   static  final Expr _c_5 = new Expr (Symbol.newInt ("1"));
@@ -27 +27 @@
   static  final Expr _c_17 = new Expr (Symbol.newWord ("TRY"));
   static  final Expr _c_18 = new Expr (Symbol.newWord ("ERROR"));
-  static  final Expr _c_19 = new Expr ((Comparable) _c_14);
+  static  final Expr _c_19 = new Expr ((Comparable<?>) _c_14);
   static  final Expr _c_20 = Expr.concat (Symbol.newWord ("aux"), Symbol.newWord ("block"));
   static  final Expr _c_21 = new Expr (Symbol.newWord ("CALL"));
@@ -52 +52 @@
     }
   });
-  static  final Expr _c_33 = Expr.concat ((Comparable) Expr.empty, (Comparable) Expr.empty);
+  static  final Expr _c_33 = Expr.concat ((Comparable<?>) Expr.empty, (Comparable<?>) Expr.empty);
   static  final Expr _c_34 = Expr.getConcatenator (3).toRight (Symbol.newWord ("Apply")).toRight (Symbol.newWord ("Apply")).toRight (Symbol.newWord ("Unexpected fail")).yield ();
   static  final Expr _c_35 = new Expr (Symbol.newWord ("_"));
@@ -185 +185 @@
                       Expr _v_deref__deref__deref__item = (Expr) _v_deref__deref__item.at ((0 + 1));
                       Expr _v_deref__deref__deref__item2 = (Expr) _v_deref__deref__item.at ((0 + 1 + 1));
-                      int _v_len9 = _v_deref__deref__deref__item2.length ();
+                      int _v_len9 = _v_deref__deref__deref__item.length ();
                       int _v_len10 = 0;
                       if (_v_len9 < _v_len10)
@@ -191 +191 @@
                         break _block4__branch1;
                       }
-                      int _v_len__line = (_v_len9 - _v_len10);
-                      int _v_len11 = _v_deref__deref__deref__item.length ();
+                      int _v_len__file = (_v_len9 - _v_len10);
+                      int _v_len11 = _v_deref__deref__deref__item2.length ();
                       int _v_len12 = 0;
                       if (_v_len11 < _v_len12)
@@ -198 +198 @@
                         break _block4__branch1;
                       }
-                      int _v_len__file = (_v_len11 - _v_len12);
+                      int _v_len__line = (_v_len11 - _v_len12);
                       if (!_vt_name.termEquals (_v_deref__item, (0 + 1 + 1 + 1)))
                       {
@@ -281 +281 @@
             }
             int _v_len__in = (_v_len17 - _v_len18);
-            int _v_len19 = _v_deref__deref__item33.length ();
-            int _v_len20 = 1;
+            int _v_len19 = _v_deref__deref__item32.length ();
+            int _v_len20 = 0;
             if (_v_len19 < _v_len20)
             {
               break _block2__branch1;
             }
-            int _v_len__branch = (_v_len19 - _v_len20);
-            int _v_len21 = _v_deref__deref__item32.length ();
-            int _v_len22 = 0;
+            int _v_len__out = (_v_len19 - _v_len20);
+            int _v_len21 = _v_deref__deref__item33.length ();
+            int _v_len22 = 1;
             if (_v_len21 < _v_len22)
             {
               break _block2__branch1;
             }
-            int _v_len__out = (_v_len21 - _v_len22);
+            int _v_len__branch = (_v_len21 - _v_len22);
             if (!_v_deref__item3.isSymbolAt (0))
             {
@@ -394 +394 @@
                 rfp_helper.Del_Pragmas (_ge_in__6, _ge_auxcall2);
                 Result _ge_auxcall3 = new Result (Expr.empty);
-                rfp_debug.Add_Debug (Expr.concat ((Comparable) Expr.getConcatenator ().toRight (_c_4).toRight (_ve_p).toRight (_ge_in__6).yield (), _ge_branch__5__6), _ge_auxcall3);
+                rfp_debug.Add_Debug (Expr.concat ((Comparable<?>) Expr.getConcatenator ().toRight (_c_4).toRight (_ve_p).toRight (_ge_in__6).yield (), _ge_branch__5__6), _ge_auxcall3);
                 Result _va_6 = new Result ();
                 rfp_helper.Del_Pragmas (_ge_auxcall3.getExpr (), _va_6);
@@ -427 +427 @@
             Unstick_Blocks (_ge_branch__5__6__7, _va_8, _v_Unstick__Blocks1);
             _ge_branch__5__6__7 = _va_8.getExpr ();
-            Expr _vt__dollar_tmp_m_85_m_46 = new Expr ((Comparable) _v_Unstick__Blocks1.getExpr ());
+            Expr _vt__dollar_tmp_m_85_m_46 = new Expr ((Comparable<?>) _v_Unstick__Blocks1.getExpr ());
             Result _ge_auxcall5 = new Result (Expr.empty);
             rfp_vars.Vars (_ge_in__6__7, _ge_auxcall5);
@@ -433 +433 @@
             Rename_Vars (_c_6, _ge_auxcall5.getExpr (), Expr.empty, _ge_branch__5__6__7, _va_9);
             _ge_branch__5__6__7 = _va_9.getExpr ();
-            _ge_item__3 = new Expr ((Comparable) Expr.getConcatenator ().toRight (_vs_link).toRight (_vs_tag).toRight (_vt_name).toRight ((Comparable) _ge_in__6__7).toRight ((Comparable) _ve_out).toRight ((Comparable) Expr.concat (_c_2, _ge_branch__5__6__7)).yield ());
+            _ge_item__3 = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_vs_link).toRight (_vs_tag).toRight (_vt_name).toRight ((Comparable<?>) _ge_in__6__7).toRight ((Comparable<?>) _ve_out).toRight ((Comparable<?>) Expr.concat (_c_2, _ge_branch__5__6__7)).yield ());
             break _block2;
           }
@@ -869 +869 @@
                   Result _v_Unstick__Blocks1 = new Result (Expr.empty);
                   Unstick_Blocks (_ve_R, _v_Unstick__Blocks1, _v_res2);
-                  _v_res1.assign (Expr.getConcatenator ().toRight (_ve_L).toRight ((Comparable) Expr.concat (_vs_block, _ve_br)).toRight ((Comparable) Expr.concat (_c_12, _ve_aux.getExpr ())).toRight ((Comparable) Expr.concat (_c_4, _ve_aux.getExpr ())).toRight (_v_Unstick__Blocks1.getExpr ()).yield ());
+                  _v_res1.assign (Expr.getConcatenator ().toRight (_ve_L).toRight ((Comparable<?>) Expr.concat (_vs_block, _ve_br)).toRight ((Comparable<?>) Expr.concat (_c_12, _ve_aux.getExpr ())).toRight ((Comparable<?>) Expr.concat (_c_4, _ve_aux.getExpr ())).toRight (_v_Unstick__Blocks1.getExpr ()).yield ());
                   break _block3;
                 }
@@ -879 +879 @@
                   Result _ge_auxcall2 = new Result (Expr.empty);
                   rfp_format.MSG (_ve_Fes, _ge_auxcall2);
-                  _v_res1.assign (Expr.concat (_ve_L, (Comparable) Expr.concat (_vs_block, _ve_br)));
+                  _v_res1.assign (Expr.concat (_ve_L, (Comparable<?>) Expr.concat (_vs_block, _ve_br)));
                   _v_res2.assign (_ge_auxcall2.getExpr ());
                   break _block3;
@@ -885 +885 @@
                 Result _v_Unstick__Blocks2 = new Result (Expr.empty);
                 Unstick_Blocks (_ve_R, _v_Unstick__Blocks2, _v_res2);
-                _v_res1.assign (Expr.getConcatenator ().toRight (_ve_L).toRight ((Comparable) Expr.concat (_vs_block, _ve_br)).toRight (_v_Unstick__Blocks2.getExpr ()).yield ());
+                _v_res1.assign (Expr.getConcatenator ().toRight (_ve_L).toRight ((Comparable<?>) Expr.concat (_vs_block, _ve_br)).toRight (_v_Unstick__Blocks2.getExpr ()).yield ());
               }
               break _exit__iter1;
@@ -920 +920 @@
             Unstick_Blocks (_ve_branch, _ve_new__branch, _ve_Fe);
             _ve_branches = _ve_rest;
-            _ve_br = Expr.concat (_ve_br, (Comparable) Expr.concat (_c_2, _ve_new__branch.getExpr ()));
-            _ve_Fes = Expr.concat (_ve_Fes, (Comparable) _ve_Fe.getExpr ());
+            _ve_br = Expr.concat (_ve_br, (Comparable<?>) Expr.concat (_c_2, _ve_new__branch.getExpr ()));
+            _ve_Fes = Expr.concat (_ve_Fes, (Comparable<?>) _ve_Fe.getExpr ());
           }
           break _block1;
@@ -982 +982 @@
           }
           Result _v_Unstick__Blocks3 = new Result (Expr.empty);
-          Unstick_Blocks (Expr.concat ((Comparable) Expr.concat (_vs_block, _ve_branches), _ve_R), _v_Unstick__Blocks3, _v_res2);
+          Unstick_Blocks (Expr.concat ((Comparable<?>) Expr.concat (_vs_block, _ve_branches), _ve_R), _v_Unstick__Blocks3, _v_res2);
           _v_res1.assign (Expr.concat (_ve_L, _v_Unstick__Blocks3.getExpr ()));
           break _block1;
@@ -1048 +1048 @@
               Expr _ve_2 = Expr.empty;
               _ve_2 = _v_deref__Re.subexpr ((0 + 1), _v_len__2);
-              _ve_Result = Expr.concat ((Comparable) Expr.concat (_c_4, _ve_1), _ve_2);
+              _ve_Result = Expr.concat ((Comparable<?>) Expr.concat (_c_4, _ve_1), _ve_2);
               break _block7;
             }
-            _ve_Result = new Expr ((Comparable) Expr.concat (_c_4, _ve_Re));
+            _ve_Result = new Expr ((Comparable<?>) Expr.concat (_c_4, _ve_Re));
           }
           _block8: {
@@ -1071 +1071 @@
             Result _ve_Fe = new Result (Expr.empty);
             rfp_format.Format_Exp (_ve_Re, _ve_Fe);
-            rfp_format.MSG (Expr.concat ((Comparable) _ve_Fe.getExpr (), (Comparable) _ve_Fe.getExpr ()), _ve_Fe);
+            rfp_format.MSG (Expr.concat ((Comparable<?>) _ve_Fe.getExpr (), (Comparable<?>) _ve_Fe.getExpr ()), _ve_Fe);
             _v_res1.assign (Expr.getConcatenator ().toRight (_ve_L).toRight (_ve_assigns.getExpr ()).toRight (_ve_Result).yield ());
             _v_res2.assign (_ve_Fe.getExpr ());
@@ -1122 +1122 @@
           Unstick_Blocks (_ve_body, _va_14, _v_Unstick__Blocks5);
           _ve_body = _va_14.getExpr ();
-          Expr _vt_empty = new Expr ((Comparable) _v_Unstick__Blocks5.getExpr ());
+          Expr _vt_empty = new Expr ((Comparable<?>) _v_Unstick__Blocks5.getExpr ());
           Result _v_Unstick__Blocks6 = new Result (Expr.empty);
           Unstick_Blocks (_ve_R, _v_Unstick__Blocks6, _v_res2);
-          _v_res1.assign (Expr.getConcatenator ().toRight (_ve_L).toRight ((Comparable) Expr.concat (_c_15, (Comparable) Expr.concat (_c_2, _ve_body))).toRight (_v_Unstick__Blocks6.getExpr ()).yield ());
+          _v_res1.assign (Expr.getConcatenator ().toRight (_ve_L).toRight ((Comparable<?>) Expr.concat (_c_15, (Comparable<?>) Expr.concat (_c_2, _ve_body))).toRight (_v_Unstick__Blocks6.getExpr ()).yield ());
           break _block1;
         }
@@ -1175 +1175 @@
           Unstick_Blocks (_ve_body, _va_15, _v_Unstick__Blocks7);
           _ve_body = _va_15.getExpr ();
-          Expr _vt__dollar_tmp_m_150_m_40 = new Expr ((Comparable) _v_Unstick__Blocks7.getExpr ());
+          Expr _vt__dollar_tmp_m_150_m_40 = new Expr ((Comparable<?>) _v_Unstick__Blocks7.getExpr ());
           Result _v_Unstick__Blocks8 = new Result (Expr.empty);
           Unstick_Blocks (_ve_R, _v_Unstick__Blocks8, _v_res2);
-          _v_res1.assign (Expr.getConcatenator ().toRight (_ve_L).toRight ((Comparable) Expr.getConcatenator ().toRight (_c_16).toRight ((Comparable) Expr.concat (_c_2, _ve_body)).toRight (_vt_IterVars).yield ()).toRight (_v_Unstick__Blocks8.getExpr ()).yield ());
+          _v_res1.assign (Expr.getConcatenator ().toRight (_ve_L).toRight ((Comparable<?>) Expr.getConcatenator ().toRight (_c_16).toRight ((Comparable<?>) Expr.concat (_c_2, _ve_body)).toRight (_vt_IterVars).yield ()).toRight (_v_Unstick__Blocks8.getExpr ()).yield ());
           break _block1;
         }
@@ -1205 +1205 @@
           Expr _v_deref__deref__Snt6 = (Expr) _v_deref__Snt6.at ((0 + 1));
           Expr _v_deref__deref__Snt62 = (Expr) _v_deref__Snt6.at ((0 + 1 + 1));
-          int _v_len71 = _v_deref__deref__Snt62.length ();
+          int _v_len71 = _v_deref__deref__Snt6.length ();
           int _v_len72 = 1;
           if (_v_len71 < _v_len72)
@@ -1211 +1211 @@
             break _block1__branch6;
           }
-          int _v_len__CatchSnt = (_v_len71 - _v_len72);
-          int _v_len73 = _v_deref__deref__Snt6.length ();
+          int _v_len__TrySnt = (_v_len71 - _v_len72);
+          int _v_len73 = _v_deref__deref__Snt62.length ();
           int _v_len74 = 1;
           if (_v_len73 < _v_len74)
@@ -1218 +1218 @@
             break _block1__branch6;
           }
-          int _v_len__TrySnt = (_v_len73 - _v_len74);
+          int _v_len__CatchSnt = (_v_len73 - _v_len74);
           if (!_c_17.termEquals (_v_deref__Snt6, 0))
           {
@@ -1239 +1239 @@
           Unstick_Blocks (_ve_TrySnt, _va_16, _v_Unstick__Blocks9);
           _ve_TrySnt = _va_16.getExpr ();
-          Expr _vt_Try__Fe = new Expr ((Comparable) _v_Unstick__Blocks9.getExpr ());
+          Expr _vt_Try__Fe = new Expr ((Comparable<?>) _v_Unstick__Blocks9.getExpr ());
           Result _v_Unstick__Blocks10 = new Result (Expr.empty);
           Result _va_17 = new Result ();
           Unstick_Blocks (_ve_CatchSnt, _va_17, _v_Unstick__Blocks10);
           _ve_CatchSnt = _va_17.getExpr ();
-          Expr _vt_Catch__Fe = new Expr ((Comparable) _v_Unstick__Blocks10.getExpr ());
+          Expr _vt_Catch__Fe = new Expr ((Comparable<?>) _v_Unstick__Blocks10.getExpr ());
           Result _ge_auxcall3 = new Result (Expr.empty);
           rfp_format.MSG (Expr.concat (_vt_Try__Fe, _vt_Catch__Fe), _ge_auxcall3);
-          _v_res1.assign (Expr.concat (_ve_L, (Comparable) Expr.getConcatenator ().toRight (_c_17).toRight ((Comparable) Expr.concat (_c_2, _ve_TrySnt)).toRight ((Comparable) Expr.concat (_c_2, _ve_CatchSnt)).yield ()));
+          _v_res1.assign (Expr.concat (_ve_L, (Comparable<?>) Expr.getConcatenator ().toRight (_c_17).toRight ((Comparable<?>) Expr.concat (_c_2, _ve_TrySnt)).toRight ((Comparable<?>) Expr.concat (_c_2, _ve_CatchSnt)).yield ()));
           _v_res2.assign (_ge_auxcall3.getExpr ());
           break _block1;
@@ -1291 +1291 @@
           Unstick_Blocks (_ve_Err, _va_18, _v_Unstick__Blocks11);
           _ve_Err = _va_18.getExpr ();
-          Expr _vt__dollar_tmp_m_157_m_36 = new Expr ((Comparable) _v_Unstick__Blocks11.getExpr ());
-          _v_res1.assign (Expr.concat (_ve_L, (Comparable) Expr.concat (_c_18, (Comparable) Expr.concat (_c_2, _ve_Err))));
+          Expr _vt__dollar_tmp_m_157_m_36 = new Expr ((Comparable<?>) _v_Unstick__Blocks11.getExpr ());
+          _v_res1.assign (Expr.concat (_ve_L, (Comparable<?>) Expr.concat (_c_18, (Comparable<?>) Expr.concat (_c_2, _ve_Err))));
           _v_res2.assign (_c_19);
           break _block1;
@@ -1391 +1391 @@
             }
             _v_res1.assign (Expr.empty);
-            _v_res2.assign (Expr.concat (_ve_Re, (Comparable) Expr.concat (_c_14, _ve_1.getExpr ())));
+            _v_res2.assign (Expr.concat (_ve_Re, (Comparable<?>) Expr.concat (_c_14, _ve_1.getExpr ())));
             break _block3;
           }
@@ -1414 +1414 @@
           Result _v_Flatten__Result1 = new Result (Expr.empty);
           Flatten_Result (_vs_Istail, Expr.concat (_ve_Re, _ve_aux.getExpr ()), _ve_rest, _v_Flatten__Result1, _v_res2);
-          _v_res1.assign (Expr.getConcatenator ().toRight (_ve_1.getExpr ()).toRight ((Comparable) Expr.concat (_c_12, _ve_aux.getExpr ())).toRight (_v_Flatten__Result1.getExpr ()).yield ());
+          _v_res1.assign (Expr.getConcatenator ().toRight (_ve_1.getExpr ()).toRight ((Comparable<?>) Expr.concat (_c_12, _ve_aux.getExpr ())).toRight (_v_Flatten__Result1.getExpr ()).yield ());
         }
         break _block1;
@@ -1452 +1452 @@
         Flatten_Result (_c_22, Expr.empty, _ve_r, _ve_assigns, _va_20);
         _ve_r = _va_20.getExpr ();
-        Expr _vt_1 = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_21).toRight (_vt_name).toRight (_ve_r).yield ());
+        Expr _vt_1 = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_21).toRight (_vt_name).toRight (_ve_r).yield ());
         _block4: {
           _block4__branch1: {
@@ -1489 +1489 @@
           Result _v_Flatten__Result2 = new Result (Expr.empty);
           Flatten_Result (_vs_Istail, Expr.concat (_ve_Re, _ve_aux1.getExpr ()), _ve_rest, _v_Flatten__Result2, _v_res2);
-          _v_res1.assign (Expr.getConcatenator ().toRight (_ve_assigns.getExpr ()).toRight ((Comparable) Expr.concat (_c_4, _vt_1)).toRight ((Comparable) Expr.concat (_c_12, _ve_aux1.getExpr ())).toRight (_v_Flatten__Result2.getExpr ()).yield ());
+          _v_res1.assign (Expr.getConcatenator ().toRight (_ve_assigns.getExpr ()).toRight ((Comparable<?>) Expr.concat (_c_4, _vt_1)).toRight ((Comparable<?>) Expr.concat (_c_12, _ve_aux1.getExpr ())).toRight (_v_Flatten__Result2.getExpr ()).yield ());
         }
         break _block1;
@@ -1526 +1526 @@
         _ve_r = _va_22.getExpr ();
         Result _v_Flatten__Result3 = new Result (Expr.empty);
-        Flatten_Result (_vs_Istail, Expr.concat (_ve_Re, (Comparable) Expr.concat (_c_24, _ve_r)), _ve_rest, _v_Flatten__Result3, _v_res2);
+        Flatten_Result (_vs_Istail, Expr.concat (_ve_Re, (Comparable<?>) Expr.concat (_c_24, _ve_r)), _ve_rest, _v_Flatten__Result3, _v_res2);
         _v_res1.assign (Expr.concat (_ve_assigns.getExpr (), _v_Flatten__Result3.getExpr ()));
         break _block1;
@@ -1834 +1834 @@
               rfp_helper.Del_Pragmas (_ve_in__expr.getExpr (), _ge_in__expr__7);
               _ge_in__1 = _ge_in__expr__7.getExpr ();
-              _ge_Sentence__1 = Expr.concat ((Comparable) Expr.concat (_c_4, _ge_in__expr__7.getExpr ()), _ve_Sentence);
+              _ge_Sentence__1 = Expr.concat ((Comparable<?>) Expr.concat (_c_4, _ge_in__expr__7.getExpr ()), _ve_Sentence);
               break _block5;
             }
             _ge_in__1 = _ve_in__expr.getExpr ();
-            _ge_Sentence__1 = Expr.concat ((Comparable) Expr.concat (_c_28, _ve_in__expr.getExpr ()), _ve_Sentence);
+            _ge_Sentence__1 = Expr.concat ((Comparable<?>) Expr.concat (_c_28, _ve_in__expr.getExpr ()), _ve_Sentence);
           }
         }
@@ -1918 +1918 @@
             }
             _ge_in__1 = _ve_in__expr.getExpr ();
-            _ge_Sentence__1 = Expr.concat ((Comparable) Expr.getConcatenator ().toRight (_vs_block).toRight ((Comparable) Expr.concat (_c_1, _ve_Pragma)).toRight (_ve_br).yield (), _ve_Snt);
+            _ge_Sentence__1 = Expr.concat ((Comparable<?>) Expr.getConcatenator ().toRight (_vs_block).toRight ((Comparable<?>) Expr.concat (_c_1, _ve_Pragma)).toRight (_ve_br).yield (), _ve_Snt);
             break _exit__iter1;
           }
@@ -2064 +2064 @@
               Result _ge_auxcall3 = new Result (Expr.empty);
               rfp_helper.Subst (_ve_pats.getExpr (), _ve_repls.getExpr (), _ve_br__snt, _ge_auxcall3);
-              _ve_br = Expr.concat (_ve_br, (Comparable) Expr.getConcatenator ().toRight (_c_2).toRight (_vt_p).toRight (_ge_auxcall3.getExpr ()).yield ());
+              _ve_br = Expr.concat (_ve_br, (Comparable<?>) Expr.getConcatenator ().toRight (_c_2).toRight (_vt_p).toRight (_ge_auxcall3.getExpr ()).yield ());
               _ve_branches = _ve_rest;
               break _block8;
             }
-            _ve_br = Expr.concat (_ve_br, (Comparable) Expr.getConcatenator ().toRight (_c_2).toRight (_vt_p).toRight ((Comparable) Expr.getConcatenator ().toRight (_vs_dir).toRight (_vt_pp).toRight (_ve_Pe).yield ()).toRight (_ve_br__snt).yield ());
+            _ve_br = Expr.concat (_ve_br, (Comparable<?>) Expr.getConcatenator ().toRight (_c_2).toRight (_vt_p).toRight ((Comparable<?>) Expr.getConcatenator ().toRight (_vs_dir).toRight (_vt_pp).toRight (_ve_Pe).yield ()).toRight (_ve_br__snt).yield ());
             _ve_branches = _ve_rest;
           }
@@ -2132 +2132 @@
             }
             _ge_in__1 = _ve_in__expr.getExpr ();
-            _ge_Sentence__1 = Expr.concat ((Comparable) Expr.concat (_vs_block, _ve_br), _ve_Snt);
+            _ge_Sentence__1 = Expr.concat ((Comparable<?>) Expr.concat (_vs_block, _ve_br), _ve_Snt);
             break _exit__iter2;
           }
@@ -2274 +2274 @@
               Result _ge_auxcall5 = new Result (Expr.empty);
               rfp_helper.Subst (_ve_pats.getExpr (), _ve_repls.getExpr (), _ve_br__snt, _ge_auxcall5);
-              _ve_br = Expr.concat (_ve_br, (Comparable) Expr.concat (_c_2, _ge_auxcall5.getExpr ()));
+              _ve_br = Expr.concat (_ve_br, (Comparable<?>) Expr.concat (_c_2, _ge_auxcall5.getExpr ()));
               _ve_branches = _ve_rest;
               break _block12;
             }
-            _ve_br = Expr.concat (_ve_br, (Comparable) Expr.getConcatenator ().toRight (_c_2).toRight ((Comparable) Expr.concat (_vs_dir, _ve_Pe)).toRight (_ve_br__snt).yield ());
+            _ve_br = Expr.concat (_ve_br, (Comparable<?>) Expr.getConcatenator ().toRight (_c_2).toRight ((Comparable<?>) Expr.concat (_vs_dir, _ve_Pe)).toRight (_ve_br__snt).yield ());
             _ve_branches = _ve_rest;
           }
@@ -2413 +2413 @@
           refal.plus.List.Or (_ve_vars, _ge_auxcall2.getExpr (), _ge_auxcall3);
           _ve_vars = _ge_auxcall3.getExpr ();
-          _ve_new__Snt = Expr.concat (_ve_new__Snt, (Comparable) Expr.concat (_vs_tag, _ve_Pe1));
+          _ve_new__Snt = Expr.concat (_ve_new__Snt, (Comparable<?>) Expr.concat (_vs_tag, _ve_Pe1));
           _ge_Snt__0 = _ve_rest__Snt;
           break _block2;
@@ -2483 +2483 @@
           refal.plus.List.Or (_ve_vars, _ge_auxcall5.getExpr (), _ge_auxcall6);
           _ve_vars = _ge_auxcall6.getExpr ();
-          _ve_new__Snt = Expr.concat (_ve_new__Snt, (Comparable) Expr.concat (_c_12, _ve_He1));
+          _ve_new__Snt = Expr.concat (_ve_new__Snt, (Comparable<?>) Expr.concat (_c_12, _ve_He1));
           _ge_Snt__0 = _ve_rest__Snt;
           break _block2;
@@ -2652 +2652 @@
               refal.plus.Arithm.Add (_vs_num, _c_31, _gs_auxcall7);
               Result _ge_branches__5 = new Result (Expr.empty);
-              if (!refal.plus.List.Map (_c_32, Expr.getConcatenator ().toRight (_gs_auxcall7.getExpr ()).toRight ((Comparable) _ve_vars).toRight ((Comparable) _ve_brv).yield (), _ve_branches, _ge_branches__5))
+              if (!refal.plus.List.Map (_c_32, Expr.getConcatenator ().toRight (_gs_auxcall7.getExpr ()).toRight ((Comparable<?>) _ve_vars).toRight ((Comparable<?>) _ve_brv).yield (), _ve_branches, _ge_branches__5))
               {
                 throw new RefalException ("org.refal.plus.compiler.rfp_as2as", "Rename_Vars", "Unexpected fail");
@@ -2690 +2690 @@
                   Rename_Vars (_gs_auxcall8.getExpr (), _ve_vars, _ve_res__vars, _ve_rest, _ge_auxcall9);
                   _ve_vars = Expr.empty;
-                  _ve_new__Snt = Expr.getConcatenator ().toRight (_ve_new__Snt).toRight ((Comparable) Expr.concat (_vs_block, _ge_branches__5.getExpr ())).toRight (_ge_auxcall9.getExpr ()).yield ();
+                  _ve_new__Snt = Expr.getConcatenator ().toRight (_ve_new__Snt).toRight ((Comparable<?>) Expr.concat (_vs_block, _ge_branches__5.getExpr ())).toRight (_ge_auxcall9.getExpr ()).yield ();
                   _ge_Snt__0 = Expr.empty;
                   break _block6;
                 }
-                _ve_new__Snt = Expr.concat (_ve_new__Snt, (Comparable) Expr.concat (_vs_block, _ge_branches__5.getExpr ()));
+                _ve_new__Snt = Expr.concat (_ve_new__Snt, (Comparable<?>) Expr.concat (_vs_block, _ge_branches__5.getExpr ()));
                 _ge_Snt__0 = _ve_rest;
               }
@@ -2701 +2701 @@
             _block7: {
               _block7__branch1: {
+                if (_ve_bl__res__vars.length () < 1)
+                {
+                  break _block7__branch1;
+                }
+                if (_ve_bl__res__vars.length () > ((_ve_bl__res__vars.length () - 1) + (_ve_bl__res__vars.length () - 1) + 1))
+                {
+                  break _block7__branch1;
+                }
                 if (_ve_vars.length () < 1)
                 {
@@ -2706 +2714 @@
                 }
                 if (_ve_vars.length () > ((_ve_vars.length () - 1) + (_ve_vars.length () - 1) + 1))
-                {
-                  break _block7__branch1;
-                }
-                if (_ve_bl__res__vars.length () < 1)
-                {
-                  break _block7__branch1;
-                }
-                if (_ve_bl__res__vars.length () > ((_ve_bl__res__vars.length () - 1) + (_ve_bl__res__vars.length () - 1) + 1))
                 {
                   break _block7__branch1;
@@ -2823 +2823 @@
           Rename_Vars (_vs_num, _ve_vars, _ve_res__vars, _ve_Sentence, _ge_auxcall10);
           _ve_vars = Expr.empty;
-          _ve_new__Snt = Expr.concat (_ve_new__Snt, (Comparable) Expr.concat (_c_2, _ge_auxcall10.getExpr ()));
+          _ve_new__Snt = Expr.concat (_ve_new__Snt, (Comparable<?>) Expr.concat (_c_2, _ge_auxcall10.getExpr ()));
           _ge_Snt__0 = Expr.empty;
           break _block2;
@@ -2872 +2872 @@
           _ve_new__rest = _v_Rename__Vars2.getExpr ().subexpr ((0 + 1), _v_len__new__rest);
           _ve_vars = Expr.empty;
-          _ve_new__Snt = Expr.getConcatenator ().toRight (_ve_new__Snt).toRight ((Comparable) Expr.getConcatenator ().toRight (_c_16).toRight (_ve_new__body).toRight (_vt_new__vars).yield ()).toRight (_ve_new__rest).yield ();
+          _ve_new__Snt = Expr.getConcatenator ().toRight (_ve_new__Snt).toRight ((Comparable<?>) Expr.getConcatenator ().toRight (_c_16).toRight (_ve_new__body).toRight (_vt_new__vars).yield ()).toRight (_ve_new__rest).yield ();
           _ge_Snt__0 = Expr.empty;
           break _block2;
@@ -2899 +2899 @@
           Rename_Vars (_vs_num, _ve_upper__vars, _ve_res__vars, _vt_CatchBranch, _ve_CatchBranch);
           _ve_vars = Expr.empty;
-          _ve_new__Snt = Expr.concat (_ve_new__Snt, (Comparable) Expr.getConcatenator ().toRight (_c_17).toRight (_ve_TryBranch.getExpr ()).toRight (_ve_CatchBranch.getExpr ()).yield ());
+          _ve_new__Snt = Expr.concat (_ve_new__Snt, (Comparable<?>) Expr.getConcatenator ().toRight (_c_17).toRight (_ve_TryBranch.getExpr ()).toRight (_ve_CatchBranch.getExpr ()).yield ());
           _ge_Snt__0 = Expr.empty;
           break _block2;
@@ -2921 +2921 @@
           Result _ge_auxcall11 = new Result (Expr.empty);
           Rename_Vars (_vs_num, _ve_vars, _ve_res__vars, _vt_branch, _ge_auxcall11);
-          _ve_new__Snt = Expr.concat (_ve_new__Snt, (Comparable) Expr.concat (_c_15, _ge_auxcall11.getExpr ()));
+          _ve_new__Snt = Expr.concat (_ve_new__Snt, (Comparable<?>) Expr.concat (_c_15, _ge_auxcall11.getExpr ()));
           _ge_Snt__0 = _ve_rest;
           break _block2;
@@ -3025 +3025 @@
         }
         int _v_len__Snt = (_v_len1 - _v_len2);
-        Expr _v_compose1 = Expr.getConcatenator ().toRight ((Comparable) _ge_arg1).toRight ((Comparable) _ge_arg2).toRight (_ge_arg3).yield ();
+        Expr _v_compose1 = Expr.getConcatenator ().toRight ((Comparable<?>) _ge_arg1).toRight ((Comparable<?>) _ge_arg2).toRight (_ge_arg3).yield ();
         if (_v_compose1.isSymbolAt (0))
         {
@@ -3036 +3036 @@
         Expr _v_deref__compose1 = (Expr) _v_compose1.at (0);
         Expr _v_deref__compose12 = (Expr) _v_compose1.at ((0 + 1));
-        int _v_len3 = _v_deref__compose12.length ();
+        int _v_len3 = _v_deref__compose1.length ();
         int _v_len4 = 1;
         if (_v_len3 < _v_len4)
@@ -3042 +3042 @@
           break _block1__branch1;
         }
-        int _v_len__substs = (_v_len3 - _v_len4);
-        int _v_len5 = _v_deref__compose1.length ();
+        int _v_len__vars = (_v_len3 - _v_len4);
+        int _v_len5 = _v_deref__compose12.length ();
         int _v_len6 = 1;
         if (_v_len5 < _v_len6)
@@ -3049 +3049 @@
           break _block1__branch1;
         }
-        int _v_len__vars = (_v_len5 - _v_len6);
+        int _v_len__substs = (_v_len5 - _v_len6);
         if (_v_deref__compose1.isSymbolAt (0))
         {
@@ -3060 +3060 @@
         Expr _v_deref__deref__compose1 = (Expr) _v_deref__compose1.at (0);
         Expr _v_deref__deref__compose12 = (Expr) _v_deref__compose12.at (0);
-        int _v_len7 = _v_deref__deref__compose12.length ();
+        int _v_len7 = _v_deref__deref__compose1.length ();
         int _v_len8 = 2;
         if (_v_len7 < _v_len8)
@@ -3066 +3066 @@
           break _block1__branch1;
         }
-        int _v_len___dollar_tmp_m_391_m_34 = (_v_len7 - _v_len8);
-        int _v_len9 = _v_deref__deref__compose1.length ();
+        int _v_len___dollar_tmp_m_391_m_12 = (_v_len7 - _v_len8);
+        int _v_len9 = _v_deref__deref__compose12.length ();
         int _v_len10 = 2;
         if (_v_len9 < _v_len10)
@@ -3073 +3073 @@
           break _block1__branch1;
         }
-        int _v_len___dollar_tmp_m_391_m_12 = (_v_len9 - _v_len10);
+        int _v_len___dollar_tmp_m_391_m_34 = (_v_len9 - _v_len10);
         if (!_v_deref__deref__compose1.isSymbolAt (0))
         {
@@ -3117 +3117 @@
       }
       int _v_len___dollar_tmp_m_395_m_10 = (_v_len11 - _v_len12);
-      Expr _v_compose2 = Expr.getConcatenator ().toRight ((Comparable) _ge_arg1).toRight ((Comparable) _ge_arg2).toRight (_ge_arg3).yield ();
+      Expr _v_compose2 = Expr.getConcatenator ().toRight ((Comparable<?>) _ge_arg1).toRight ((Comparable<?>) _ge_arg2).toRight (_ge_arg3).yield ();
       if (!_c_33.equals (_v_compose2, 0))
       {
@@ -3199 +3199 @@
                 }
                 _ve_st__pats = _vt_Statement;
-                _ve_st__repls = new Expr ((Comparable) new Expr ((Comparable) Expr.getConcatenator ().toRight (_vs_tag).toRight (_ve_p).toRight (_vt_s).yield ()));
+                _ve_st__repls = new Expr ((Comparable<?>) new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_vs_tag).toRight (_ve_p).toRight (_vt_s).yield ()));
                 break _block4;
               }
@@ -3242 +3242 @@
       _v_res2.assign (Expr.empty);
     }
-  }
-
-  static  boolean Rename_Vars_0 (Expr _ge_arg1, Result _v_res1) throws RefalException
-  {
-    int _v_len1 = _ge_arg1.length ();
-    int _v_len2 = 3;
-    if (_v_len1 < _v_len2)
-    {
-      throw new RefalException (_c_34);
-    }
-    int _v_len__stub1 = (_v_len1 - _v_len2);
-    if (_ge_arg1.isSymbolAt ((0 + 1)))
-    {
-      throw new RefalException (_c_34);
-    }
-    if (_ge_arg1.isSymbolAt ((0 + 1 + 1)))
-    {
-      throw new RefalException (_c_34);
-    }
-    Expr _v_deref__arg1 = (Expr) _ge_arg1.at ((0 + 1));
-    Expr _v_deref__arg12 = (Expr) _ge_arg1.at ((0 + 1 + 1));
-    int _v_len3 = _v_deref__arg12.length ();
-    int _v_len4 = 0;
-    if (_v_len3 < _v_len4)
-    {
-      throw new RefalException (_c_34);
-    }
-    int _v_len__stub2 = (_v_len3 - _v_len4);
-    int _v_len5 = _v_deref__arg1.length ();
-    int _v_len6 = 0;
-    if (_v_len5 < _v_len6)
-    {
-      throw new RefalException (_c_34);
-    }
-    int _v_len__stub3 = (_v_len5 - _v_len6);
-    if (!_ge_arg1.isSymbolAt (0))
-    {
-      throw new RefalException (_c_34);
-    }
-    Expr _v_stub4 = Expr.empty;
-    _v_stub4 = _ge_arg1.subexpr (0, 1);
-    Expr _v_stub1 = Expr.empty;
-    _v_stub1 = _ge_arg1.subexpr ((0 + 1 + 1 + 1), _v_len__stub1);
-    Expr _v_stub3 = Expr.empty;
-    _v_stub3 = _v_deref__arg1.subexpr (0, _v_len__stub3);
-    Expr _v_stub2 = Expr.empty;
-    _v_stub2 = _v_deref__arg12.subexpr (0, _v_len__stub2);
-    Rename_Vars (_v_stub4, _v_stub3, _v_stub2, _v_stub1, _v_res1);
-    return true;
   }
 
@@ -3338 +3289 @@
     Result _v_Rename3 = new Result (Expr.empty);
     Rename (_v_stub2, _v_stub3, _v_stub1, _v_Rename1, _v_Rename2, _v_Rename3);
-    _v_res1.assign (new Expr ((Comparable) Expr.concat (_v_Rename1.getExpr (), (Comparable) Expr.getConcatenator ().toRight (_v_Rename2.getExpr ()).toRight (_c_35).toRight (_v_Rename3.getExpr ()).yield ())));
+    _v_res1.assign (new Expr ((Comparable<?>) Expr.concat (_v_Rename1.getExpr (), (Comparable<?>) Expr.getConcatenator ().toRight (_v_Rename2.getExpr ()).toRight (_c_35).toRight (_v_Rename3.getExpr ()).yield ())));
+    return true;
+  }
+
+  static  boolean Rename_Vars_0 (Expr _ge_arg1, Result _v_res1) throws RefalException
+  {
+    int _v_len1 = _ge_arg1.length ();
+    int _v_len2 = 3;
+    if (_v_len1 < _v_len2)
+    {
+      throw new RefalException (_c_34);
+    }
+    int _v_len__stub1 = (_v_len1 - _v_len2);
+    if (_ge_arg1.isSymbolAt ((0 + 1)))
+    {
+      throw new RefalException (_c_34);
+    }
+    if (_ge_arg1.isSymbolAt ((0 + 1 + 1)))
+    {
+      throw new RefalException (_c_34);
+    }
+    Expr _v_deref__arg1 = (Expr) _ge_arg1.at ((0 + 1));
+    Expr _v_deref__arg12 = (Expr) _ge_arg1.at ((0 + 1 + 1));
+    int _v_len3 = _v_deref__arg1.length ();
+    int _v_len4 = 0;
+    if (_v_len3 < _v_len4)
+    {
+      throw new RefalException (_c_34);
+    }
+    int _v_len__stub2 = (_v_len3 - _v_len4);
+    int _v_len5 = _v_deref__arg12.length ();
+    int _v_len6 = 0;
+    if (_v_len5 < _v_len6)
+    {
+      throw new RefalException (_c_34);
+    }
+    int _v_len__stub3 = (_v_len5 - _v_len6);
+    if (!_ge_arg1.isSymbolAt (0))
+    {
+      throw new RefalException (_c_34);
+    }
+    Expr _v_stub4 = Expr.empty;
+    _v_stub4 = _ge_arg1.subexpr (0, 1);
+    Expr _v_stub1 = Expr.empty;
+    _v_stub1 = _ge_arg1.subexpr ((0 + 1 + 1 + 1), _v_len__stub1);
+    Expr _v_stub2 = Expr.empty;
+    _v_stub2 = _v_deref__arg1.subexpr (0, _v_len__stub2);
+    Expr _v_stub3 = Expr.empty;
+    _v_stub3 = _v_deref__arg12.subexpr (0, _v_len__stub3);
+    Rename_Vars (_v_stub4, _v_stub2, _v_stub3, _v_stub1, _v_res1);
     return true;
   }

to-imperative/trunk/java/compiler/org/refal/plus/compiler/rfp_asail.java

@@ -83 +83 @@
       Expr _vt_3 = Expr.empty;
       _vt_3 = _ve_args.subexpr ((0 + _v_len__1 + 1), 1);
-      Op (_ve_op, Expr.concat (_ve_1, (Comparable) Expr.getConcatenator ().toRight (_ve_op).toRight ((Comparable) _vt_2).toRight ((Comparable) _vt_3).yield ()), _v_res1);
+      Op (_ve_op, Expr.concat (_ve_1, (Comparable<?>) Expr.getConcatenator ().toRight (_ve_op).toRight ((Comparable<?>) _vt_2).toRight ((Comparable<?>) _vt_3).yield ()), _v_res1);
     }
   }

to-imperative/trunk/java/compiler/org/refal/plus/compiler/rfp_asail2asail.java

@@ -24 +24 @@
   static  final Expr _c_9 = new Expr (Symbol.newWord ("LABEL"));
   static  final Expr _c_10 = new Expr (Symbol.newWord ("TRY"));
-  static  final Expr _c_11 = new Expr ((Comparable) _c_10);
+  static  final Expr _c_11 = new Expr ((Comparable<?>) _c_10);
   static  final Expr _c_12 = new Expr (Symbol.newWord ("CATCH-ERROR"));
-  static  final Expr _c_13 = new Expr ((Comparable) _c_12);
-  static  final Expr _c_14 = new Expr ((Comparable) Expr.empty);
+  static  final Expr _c_13 = new Expr ((Comparable<?>) _c_12);
+  static  final Expr _c_14 = new Expr ((Comparable<?>) Expr.empty);
   static  final Expr _c_15 = new Expr (Symbol.newWord ("Normal-Exit"));
   static  final Expr _c_16 = new Expr (Symbol.newWord ("Persistent"));
@@ -149 +149 @@
     Result _ge_auxcall3 = new Result (Expr.empty);
     Remove_Dupl_Decl (Expr.empty, Expr.empty, _ge_auxcall2.getExpr (), _ge_auxcall3);
-    _v_res1.assign (new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_0).toRight (_vt_ModuleName).toRight (_ge_auxcall3.getExpr ()).yield ()));
+    _v_res1.assign (new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_0).toRight (_vt_ModuleName).toRight (_ge_auxcall3.getExpr ()).yield ()));
   }
 
@@ -193 +193 @@
             Expr _v_deref__deref__first = (Expr) _v_deref__first.at ((0 + 1 + 1));
             Expr _v_deref__deref__first2 = (Expr) _v_deref__first.at ((0 + 1 + 1 + 1));
-            int _v_len5 = _v_deref__deref__first2.length ();
+            int _v_len5 = _v_deref__deref__first.length ();
             int _v_len6 = 0;
             if (_v_len5 < _v_len6)
@@ -199 +199 @@
               break _block2__branch1;
             }
-            int _v_len__arg2 = (_v_len5 - _v_len6);
-            int _v_len7 = _v_deref__deref__first.length ();
+            int _v_len__arg1 = (_v_len5 - _v_len6);
+            int _v_len7 = _v_deref__deref__first2.length ();
             int _v_len8 = 0;
             if (_v_len7 < _v_len8)
@@ -206 +206 @@
               break _block2__branch1;
             }
-            int _v_len__arg1 = (_v_len7 - _v_len8);
+            int _v_len__arg2 = (_v_len7 - _v_len8);
             if (!_c_1.termEquals (_v_deref__first, 0))
             {
@@ -226 +226 @@
               _block3__branch1: {
                 Result _ge_auxcall1 = new Result (Expr.empty);
-                Simplify_Arithm (new Expr ((Comparable) _ve_arg1), _ge_auxcall1);
+                Simplify_Arithm (new Expr ((Comparable<?>) _ve_arg1), _ge_auxcall1);
                 Result _ge_auxcall2 = new Result (Expr.empty);
-                Simplify_Arithm (new Expr ((Comparable) _ve_arg2), _ge_auxcall2);
+                Simplify_Arithm (new Expr ((Comparable<?>) _ve_arg2), _ge_auxcall2);
                 Result _v_Simplify__Cmp1 = new Result (Expr.empty);
                 if (!Simplify_Cmp (_vs_op, _ge_auxcall1.getExpr (), _ge_auxcall2.getExpr (), _v_Simplify__Cmp1))
@@ -250 +250 @@
                     Expr _v_deref__Simplify__Cmp1 = (Expr) _v_Simplify__Cmp1.getExpr ().at (0);
                     Expr _v_deref__Simplify__Cmp12 = (Expr) _v_Simplify__Cmp1.getExpr ().at ((0 + 1));
-                    int _v_len9 = _v_deref__Simplify__Cmp12.length ();
+                    int _v_len9 = _v_deref__Simplify__Cmp1.length ();
                     int _v_len10 = 0;
                     if (_v_len9 < _v_len10)
@@ -256 +256 @@
                       break _block4__branch1;
                     }
-                    int _v_len__2 = (_v_len9 - _v_len10);
-                    int _v_len11 = _v_deref__Simplify__Cmp1.length ();
+                    int _v_len__1 = (_v_len9 - _v_len10);
+                    int _v_len11 = _v_deref__Simplify__Cmp12.length ();
                     int _v_len12 = 0;
                     if (_v_len11 < _v_len12)
@@ -263 +263 @@
                       break _block4__branch1;
                     }
-                    int _v_len__1 = (_v_len11 - _v_len12);
+                    int _v_len__2 = (_v_len11 - _v_len12);
                     Expr _ve_1 = Expr.empty;
                     _ve_1 = _v_deref__Simplify__Cmp1.subexpr (0, _v_len__1);
@@ -270 +270 @@
                     Result _ge_auxcall3 = new Result (Expr.empty);
                     Simplify (_ve_body, _ge_auxcall3);
-                    _ge_first__3 = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_1).toRight (_vs_op).toRight ((Comparable) _ve_1).toRight ((Comparable) _ve_2).toRight (_ge_auxcall3.getExpr ()).yield ());
+                    _ge_first__3 = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_1).toRight (_vs_op).toRight ((Comparable<?>) _ve_1).toRight ((Comparable<?>) _ve_2).toRight (_ge_auxcall3.getExpr ()).yield ());
                     break _block4;
                   }
@@ -310 +310 @@
             Result _ge_auxcall4 = new Result (Expr.empty);
             Simplify (_ve_body, _ge_auxcall4);
-            _ge_first__3 = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_2).toRight (_vt_cond).toRight (_ge_auxcall4.getExpr ()).yield ());
+            _ge_first__3 = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_2).toRight (_vt_cond).toRight (_ge_auxcall4.getExpr ()).yield ());
             break _block2;
           }
@@ -348 +348 @@
             _vt_var = _v_deref__deref__first3.subexpr ((0 + 1), 1);
             Result _ge_auxcall5 = new Result (Expr.empty);
-            Simplify_Arithm (new Expr ((Comparable) _ve_expr), _ge_auxcall5);
-            _ge_first__3 = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_4).toRight ((Comparable) Expr.concat (_c_3, _vt_var)).toRight (_ge_auxcall5.getExpr ()).yield ());
+            Simplify_Arithm (new Expr ((Comparable<?>) _ve_expr), _ge_auxcall5);
+            _ge_first__3 = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_4).toRight ((Comparable<?>) Expr.concat (_c_3, _vt_var)).toRight (_ge_auxcall5.getExpr ()).yield ());
             break _block2;
           }
@@ -387 +387 @@
             _vt_var = _v_deref__deref__first4.subexpr ((0 + 1), 1);
             Result _ge_auxcall6 = new Result (Expr.empty);
-            Simplify_Arithm (new Expr ((Comparable) _ve_expr), _ge_auxcall6);
-            _ge_first__3 = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_5).toRight ((Comparable) Expr.concat (_c_3, _vt_var)).toRight (_ge_auxcall6.getExpr ()).yield ());
+            Simplify_Arithm (new Expr ((Comparable<?>) _ve_expr), _ge_auxcall6);
+            _ge_first__3 = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_5).toRight ((Comparable<?>) Expr.concat (_c_3, _vt_var)).toRight (_ge_auxcall6.getExpr ()).yield ());
             break _block2;
           }
@@ -408 +408 @@
             Result _ge_auxcall7 = new Result (Expr.empty);
             Simplify (_ve_1, _ge_auxcall7);
-            _ge_first__3 = new Expr ((Comparable) _ge_auxcall7.getExpr ());
+            _ge_first__3 = new Expr ((Comparable<?>) _ge_auxcall7.getExpr ());
             break _block2;
           }
@@ -519 +519 @@
             Expr _ge_body__4 = Expr.empty;
             _ge_body__4 = _v_deref__1.subexpr ((0 + 1 + 1 + 1 + 1), _v_len__body__4);
-            refal.plus.Box.Put (Blocks, new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_6).toRight (_vt_name).toRight (_vt_in).toRight (_vt_out).yield ()));
+            refal.plus.Box.Put (Blocks, new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_6).toRight (_vt_name).toRight (_vt_in).toRight (_vt_out).yield ()));
             refal.plus.Table.ClearTable (Breaks);
             _ve_body = _ge_body__4;
@@ -549 +549 @@
             Expr _ge_body__4 = Expr.empty;
             _ge_body__4 = _v_deref__12.subexpr ((0 + 1 + 1 + 1 + 1), _v_len__body__42);
-            refal.plus.Box.Put (Blocks, new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_7).toRight (_vt_name).toRight (_vt_in).toRight (_vt_out).yield ()));
+            refal.plus.Box.Put (Blocks, new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_7).toRight (_vt_name).toRight (_vt_in).toRight (_vt_out).yield ()));
             refal.plus.Table.ClearTable (Breaks);
             _ve_body = _ge_body__4;
@@ -601 +601 @@
             }
             int _v_len__break = (_v_len11 - _v_len12);
-            int _v_len13 = _v_deref__deref__134.length ();
+            int _v_len13 = _v_deref__deref__133.length ();
             int _v_len14 = 0;
             if (_v_len13 < _v_len14)
@@ -607 +607 @@
               break _block2__branch3;
             }
-            int _v_len__step = (_v_len13 - _v_len14);
-            int _v_len15 = _v_deref__deref__133.length ();
+            int _v_len__cond = (_v_len13 - _v_len14);
+            int _v_len15 = _v_deref__deref__134.length ();
             int _v_len16 = 0;
             if (_v_len15 < _v_len16)
@@ -614 +614 @@
               break _block2__branch3;
             }
-            int _v_len__cond = (_v_len15 - _v_len16);
+            int _v_len__step = (_v_len15 - _v_len16);
             if (!_c_8.termEquals (_v_deref__13, 0))
             {
@@ -629 +629 @@
             Expr _ve_step = Expr.empty;
             _ve_step = _v_deref__deref__134.subexpr (0, _v_len__step);
-            refal.plus.Box.Put (Blocks, new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_8).toRight ((Comparable) _ve_cont).toRight ((Comparable) _ve_break).toRight ((Comparable) _ve_cond).toRight ((Comparable) _ve_step).yield ()));
+            refal.plus.Box.Put (Blocks, new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_8).toRight ((Comparable<?>) _ve_cont).toRight ((Comparable<?>) _ve_break).toRight ((Comparable<?>) _ve_cond).toRight ((Comparable<?>) _ve_step).yield ()));
             _ve_body = _ge_body__4;
             break _block2;
@@ -663 +663 @@
             Expr _vt_label = Expr.empty;
             _vt_label = _v_deref__deref__14.subexpr (0, 1);
-            refal.plus.Box.Put (Blocks, new Expr ((Comparable) Expr.concat (_c_9, (Comparable) _vt_label)));
+            refal.plus.Box.Put (Blocks, new Expr ((Comparable<?>) Expr.concat (_c_9, (Comparable<?>) _vt_label)));
             _ve_body = _ge_body__4;
             break _block2;
@@ -688 +688 @@
             Expr _ge_body__4 = Expr.empty;
             _ge_body__4 = _v_deref__15.subexpr ((0 + 1 + 1), _v_len__body__45);
-            refal.plus.Box.Put (Blocks, new Expr ((Comparable) Expr.concat (_c_2, _vt_cond)));
+            refal.plus.Box.Put (Blocks, new Expr ((Comparable<?>) Expr.concat (_c_2, _vt_cond)));
             _ve_body = _ge_body__4;
             break _block2;
@@ -721 +721 @@
             Expr _ge_body__4 = Expr.empty;
             _ge_body__4 = _v_deref__16.subexpr ((0 + 1 + 1 + 1 + 1), _v_len__body__46);
-            refal.plus.Box.Put (Blocks, new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_1).toRight (_vs_op).toRight (_vt_arg1).toRight (_vt_arg2).yield ()));
+            refal.plus.Box.Put (Blocks, new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_1).toRight (_vs_op).toRight (_vt_arg1).toRight (_vt_arg2).yield ()));
             _ve_body = _ge_body__4;
             break _block2;
@@ -812 +812 @@
                   break _block4__branch1;
                 }
-                _ve_t1 = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_9).toRight ((Comparable) _vt_label).toRight (_ve_body).yield ());
+                _ve_t1 = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_9).toRight ((Comparable<?>) _vt_label).toRight (_ve_body).yield ());
                 _ge_2__4 = _ve_2;
                 break _block4;
@@ -903 +903 @@
             }
             int _v_len__cont2 = (_v_len29 - _v_len30);
-            int _v_len31 = _v_deref__deref__GetR123.length ();
+            int _v_len31 = _v_deref__deref__GetR122.length ();
             int _v_len32 = 0;
             if (_v_len31 < _v_len32)
@@ -909 +909 @@
               break _block3__branch2;
             }
-            int _v_len__step2 = (_v_len31 - _v_len32);
-            int _v_len33 = _v_deref__deref__GetR122.length ();
+            int _v_len__break2 = (_v_len31 - _v_len32);
+            int _v_len33 = _v_deref__deref__GetR123.length ();
             int _v_len34 = 0;
             if (_v_len33 < _v_len34)
@@ -916 +916 @@
               break _block3__branch2;
             }
-            int _v_len__break2 = (_v_len33 - _v_len34);
+            int _v_len__step2 = (_v_len33 - _v_len34);
             if (!_c_8.termEquals (_v_deref__GetR12, 0))
             {
@@ -937 +937 @@
                   break _block6__branch1;
                 }
-                _ve_t1 = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_8).toRight ((Comparable) _ve_cont).toRight ((Comparable) _ve_break).toRight (_c_14).toRight ((Comparable) _ve_step).toRight (_ve_body).yield ());
+                _ve_t1 = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_8).toRight ((Comparable<?>) _ve_cont).toRight ((Comparable<?>) _ve_break).toRight (_c_14).toRight ((Comparable<?>) _ve_step).toRight (_ve_body).yield ());
                 _ge_2__4 = _ve_2;
                 break _block6;
               }
-              _ve_t1 = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_8).toRight ((Comparable) _ve_cont).toRight ((Comparable) _ve_break).toRight (_c_14).toRight ((Comparable) _ve_step).toRight (_ve_body).yield ());
+              _ve_t1 = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_8).toRight ((Comparable<?>) _ve_cont).toRight ((Comparable<?>) _ve_break).toRight (_c_14).toRight ((Comparable<?>) _ve_step).toRight (_ve_body).yield ());
               _ge_2__4 = Expr.empty;
             }
@@ -982 +982 @@
                 Expr _ve__dollar_tmp_m_103_m_34 = Expr.empty;
                 _ve__dollar_tmp_m_103_m_34 = _v_deref__Get2.subexpr (0, _v_len___dollar_tmp_m_103_m_34);
-                _ve_t1 = new Expr ((Comparable) Expr.concat (_c_10, _ve_body));
+                _ve_t1 = new Expr ((Comparable<?>) Expr.concat (_c_10, _ve_body));
                 _ge_2__4 = _ve_2;
                 break _block7;
@@ -1013 +1013 @@
               Expr _ve_catch__body = Expr.empty;
               _ve_catch__body = _v_deref__2.subexpr ((0 + 1), _v_len__catch__body);
-              _ve_t1 = new Expr ((Comparable) Expr.concat (_c_10, _ve_body));
-              _ge_2__4 = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_12).toRight (_ve_catch__body).toRight (_ve_3).yield ());
+              _ve_t1 = new Expr ((Comparable<?>) Expr.concat (_c_10, _ve_body));
+              _ge_2__4 = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_12).toRight (_ve_catch__body).toRight (_ve_3).yield ());
             }
             break _block3;
@@ -1032 +1032 @@
           Expr _ve_item = Expr.empty;
           _ve_item = _v_deref__GetR13.subexpr (0, _v_len__item);
-          _ve_t1 = new Expr ((Comparable) Expr.concat (_ve_item, _ve_body));
+          _ve_t1 = new Expr ((Comparable<?>) Expr.concat (_ve_item, _ve_body));
           _ge_2__4 = _ve_2;
         }
@@ -1135 +1135 @@
             Expr _ve_breaks = Expr.empty;
             _ve_breaks = _v_deref__GetR2.subexpr (0, _v_len__breaks);
-            refal.plus.Box.Put (Last_Breaks, new Expr ((Comparable) Expr.concat (_ve_breaks, _vt_label)));
+            refal.plus.Box.Put (Last_Breaks, new Expr ((Comparable<?>) Expr.concat (_ve_breaks, _vt_label)));
             _block10: {
               _block10__branch1: {
@@ -1268 +1268 @@
                 }
                 int _v_len__break3 = (_v_len59 - _v_len60);
-                int _v_len61 = _v_deref__deref__Get44.length ();
+                int _v_len61 = _v_deref__deref__Get43.length ();
                 int _v_len62 = 0;
                 if (_v_len61 < _v_len62)
@@ -1274 +1274 @@
                   break _block11__branch1;
                 }
-                int _v_len__step3 = (_v_len61 - _v_len62);
-                int _v_len63 = _v_deref__deref__Get43.length ();
+                int _v_len__cond2 = (_v_len61 - _v_len62);
+                int _v_len63 = _v_deref__deref__Get44.length ();
                 int _v_len64 = 0;
                 if (_v_len63 < _v_len64)
@@ -1281 +1281 @@
                   break _block11__branch1;
                 }
-                int _v_len__cond2 = (_v_len63 - _v_len64);
+                int _v_len__step3 = (_v_len63 - _v_len64);
                 if (!_c_8.termEquals (_v_deref__Get4, 0))
                 {
@@ -1387 +1387 @@
           Expr _ve_breaks = Expr.empty;
           _ve_breaks = _v_deref__GetR3.subexpr (0, _v_len__breaks2);
-          refal.plus.Box.Put (Last_Breaks, new Expr ((Comparable) Expr.concat (_ve_breaks, _c_15)));
+          refal.plus.Box.Put (Last_Breaks, new Expr ((Comparable<?>) Expr.concat (_ve_breaks, _c_15)));
           _ve_1 = Expr.empty;
           break _block12;
@@ -1504 +1504 @@
             }
             Result _va_5 = new Result ();
-            Remove_Dupl_Decl (_ve_decls, _ve_subst, Expr.concat (_ve_xpr, (Comparable) _ve_len), _va_5);
+            Remove_Dupl_Decl (_ve_decls, _ve_subst, Expr.concat (_ve_xpr, (Comparable<?>) _ve_len), _va_5);
             _ve_xpr = _va_5.getExpr ();
             Result _ve_decl1 = new Result (Expr.empty);
@@ -1592 +1592 @@
             Result _v_Remove__Dupl__Decl2 = new Result (Expr.empty);
             Remove_Dupl_Decl (_ge_decls__4__5.getExpr (), _ge_subst__4__5.getExpr (), _ve_rest, _v_Remove__Dupl__Decl2);
-            _v_res1.assign (Expr.concat ((Comparable) Expr.getConcatenator ().toRight (_vs_split).toRight (_ve_xpr).toRight (_gt_var1__5).toRight (_gt_var2__6).yield (), _v_Remove__Dupl__Decl2.getExpr ()));
+            _v_res1.assign (Expr.concat ((Comparable<?>) Expr.getConcatenator ().toRight (_vs_split).toRight (_ve_xpr).toRight (_gt_var1__5).toRight (_gt_var2__6).yield (), _v_Remove__Dupl__Decl2.getExpr ()));
             break _block2;
           }
@@ -1657 +1657 @@
             Result _v_Remove__Dupl__Decl3 = new Result (Expr.empty);
             Remove_Dupl_Decl (_ve_decls, _ve_subst, _ve_rest, _v_Remove__Dupl__Decl3);
-            _v_res1.assign (Expr.concat ((Comparable) _ge_auxcall1.getExpr (), _v_Remove__Dupl__Decl3.getExpr ()));
+            _v_res1.assign (Expr.concat ((Comparable<?>) _ge_auxcall1.getExpr (), _v_Remove__Dupl__Decl3.getExpr ()));
             break _block2;
           }
@@ -1737 +1737 @@
                   break _block3;
                 }
-                _v_res1.assign (new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_4).toRight (_vt_var).toRight (_ve_expr).yield ()));
+                _v_res1.assign (new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_4).toRight (_vt_var).toRight (_ve_expr).yield ()));
                 _v_res2.assign (_ve_decls);
                 _v_res3.assign (_ve_subst);
@@ -1779 +1779 @@
             Result _gs_auxcall1 = new Result (Expr.empty);
             Free_Idx (_gs_auxcall1);
-            Expr _vt_new__var = new Expr ((Comparable) Expr.getConcatenator ().toRight (_vs_tag).toRight (_c_25).toRight ((Comparable) Expr.concat (_ve_name, _gs_auxcall1.getExpr ())).yield ());
+            Expr _vt_new__var = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_vs_tag).toRight (_c_25).toRight ((Comparable<?>) Expr.concat (_ve_name, _gs_auxcall1.getExpr ())).yield ());
             Expr _ge_expr__5 = Expr.empty;
             _block4: {
@@ -1792 +1792 @@
               _ge_expr__5 = _ve_expr;
             }
-            _v_res1.assign (new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_5).toRight (_vs_type).toRight (_vt_new__var).toRight (_ge_expr__5).yield ()));
-            _v_res2.assign (Expr.concat (_ve_decls, (Comparable) Expr.concat (_vs_type, _vt_new__var)));
-            _v_res3.assign (Expr.concat (_ve_subst, (Comparable) Expr.concat (_vt_var, _vt_new__var)));
+            _v_res1.assign (new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_5).toRight (_vs_type).toRight (_vt_new__var).toRight (_ge_expr__5).yield ()));
+            _v_res2.assign (Expr.concat (_ve_decls, (Comparable<?>) Expr.concat (_vs_type, _vt_new__var)));
+            _v_res3.assign (Expr.concat (_ve_subst, (Comparable<?>) Expr.concat (_vt_var, _vt_new__var)));
           }
           break _exit1;
@@ -1800 +1800 @@
         break _block1;
       }
-      _v_res1.assign (new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_5).toRight (_vs_type).toRight (_vt_var).toRight (_ve_expr).yield ()));
-      _v_res2.assign (Expr.concat (_ve_decls, (Comparable) Expr.concat (_vs_type, _vt_var)));
+      _v_res1.assign (new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_5).toRight (_vs_type).toRight (_vt_var).toRight (_ve_expr).yield ()));
+      _v_res2.assign (Expr.concat (_ve_decls, (Comparable<?>) Expr.concat (_vs_type, _vt_var)));
       _v_res3.assign (_ve_subst);
     }
@@ -1947 +1947 @@
           Result _ge_auxcall7 = new Result (Expr.empty);
           refal.plus.List.Paren (_ve_1, _ge_auxcall7);
-          _v_res1.assign (new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_26).toRight (_vs_op).toRight (_ge_auxcall7.getExpr ()).yield ()));
+          _v_res1.assign (new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_26).toRight (_vs_op).toRight (_ge_auxcall7.getExpr ()).yield ()));
         }
         break _block1;
@@ -1971 +1971 @@
           throw new RefalException ("org.refal.plus.compiler.rfp_asail2asail", "Simplify_Infix", "Unexpected fail");
         }
-        _v_res1.assign (new Expr ((Comparable) _ge_auxcall8.getExpr ()));
+        _v_res1.assign (new Expr ((Comparable<?>) _ge_auxcall8.getExpr ()));
         break _block1;
       }
@@ -2034 +2034 @@
       Result _ge_auxcall2 = new Result (Expr.empty);
       refal.plus.List.Paren (_ve_1, _ge_auxcall2);
-      _v_res1.assign (new Expr ((Comparable) Expr.concat (_c_39, _ge_auxcall2.getExpr ())));
+      _v_res1.assign (new Expr ((Comparable<?>) Expr.concat (_c_39, _ge_auxcall2.getExpr ())));
     }
   }
@@ -2361 +2361 @@
     _block1: {
       _block1__branch1: {
-        Expr _v_compose1 = Expr.getConcatenator ().toRight (_gs_arg1).toRight ((Comparable) _ge_arg2).toRight ((Comparable) _ge_arg3).yield ();
+        Expr _v_compose1 = Expr.getConcatenator ().toRight (_gs_arg1).toRight ((Comparable<?>) _ge_arg2).toRight ((Comparable<?>) _ge_arg3).yield ();
         if (_v_compose1.isSymbolAt ((0 + 1)))
         {
@@ -2372 +2372 @@
         Expr _v_deref__compose1 = (Expr) _v_compose1.at ((0 + 1));
         Expr _v_deref__compose12 = (Expr) _v_compose1.at ((0 + 1 + 1));
+        if (_v_deref__compose1.length () < 1)
+        {
+          break _block1__branch1;
+        }
+        if (_v_deref__compose1.length () > ((_v_deref__compose1.length () - 1) + (_v_deref__compose1.length () - 1) + 1))
+        {
+          break _block1__branch1;
+        }
         if (_v_deref__compose12.length () < 1)
         {
@@ -2377 +2385 @@
         }
         if (_v_deref__compose12.length () > ((_v_deref__compose12.length () - 1) + (_v_deref__compose12.length () - 1) + 1))
-        {
-          break _block1__branch1;
-        }
-        if (_v_deref__compose1.length () < 1)
-        {
-          break _block1__branch1;
-        }
-        if (_v_deref__compose1.length () > ((_v_deref__compose1.length () - 1) + (_v_deref__compose1.length () - 1) + 1))
         {
           break _block1__branch1;
@@ -2458 +2458 @@
         Result _ge_auxcall2 = new Result (Expr.empty);
         refal.plus.List.Foldr1 (_c_49, Expr.empty, _ge_arg3, _ge_auxcall2);
-        if (!refal.plus.Apply.Apply (_gs_arg1, Expr.concat ((Comparable) _ge_auxcall1.getExpr (), (Comparable) _ge_auxcall2.getExpr ()), _v_res1)) {
+        if (!refal.plus.Apply.Apply (_gs_arg1, Expr.concat ((Comparable<?>) _ge_auxcall1.getExpr (), (Comparable<?>) _ge_auxcall2.getExpr ()), _v_res1)) {
           return false;
         }
         break _block1;
       }
-      _v_res1.assign (Expr.concat ((Comparable) _ge_arg2, (Comparable) _ge_arg3));
+      _v_res1.assign (Expr.concat ((Comparable<?>) _ge_arg2, (Comparable<?>) _ge_arg3));
     }
     return true;
@@ -2509 +2509 @@
   }
 
-  static  boolean IsInt_0 (Expr _ge_arg1, Result _v_res1) throws RefalException
-  {
-    int _v_len1 = _ge_arg1.length ();
-    int _v_len2 = 0;
-    if (_v_len1 < _v_len2)
-    {
-      throw new RefalException (_c_50);
-    }
-    int _v_len__stub1 = (_v_len1 - _v_len2);
-    Expr _v_stub1 = Expr.empty;
-    _v_stub1 = _ge_arg1.subexpr (0, _v_len__stub1);
-    if (!refal.plus.Class.IsInt (_v_stub1))
-    {
-      return false;
-    }
-    _v_res1.assign (Expr.empty);
-    return true;
-  }
-
   static  boolean Add_0 (Expr _ge_arg1, Result _v_res1) throws RefalException
   {
@@ -2550 +2531 @@
   }
 
+  static  boolean IsInt_0 (Expr _ge_arg1, Result _v_res1) throws RefalException
+  {
+    int _v_len1 = _ge_arg1.length ();
+    int _v_len2 = 0;
+    if (_v_len1 < _v_len2)
+    {
+      throw new RefalException (_c_50);
+    }
+    int _v_len__stub1 = (_v_len1 - _v_len2);
+    Expr _v_stub1 = Expr.empty;
+    _v_stub1 = _ge_arg1.subexpr (0, _v_len__stub1);
+    if (!refal.plus.Class.IsInt (_v_stub1))
+    {
+      return false;
+    }
+    _v_res1.assign (Expr.empty);
+    return true;
+  }
+
+  static  boolean Gt_0 (Expr _ge_arg1, Result _v_res1) throws RefalException
+  {
+    if (_ge_arg1.length () != 2)
+    {
+      throw new RefalException (_c_50);
+    }
+    if (_ge_arg1.isSymbolAt (0))
+    {
+      throw new RefalException (_c_50);
+    }
+    if (_ge_arg1.isSymbolAt ((0 + 1)))
+    {
+      throw new RefalException (_c_50);
+    }
+    Expr _v_deref__arg1 = (Expr) _ge_arg1.at (0);
+    Expr _v_deref__arg12 = (Expr) _ge_arg1.at ((0 + 1));
+    int _v_len1 = _v_deref__arg1.length ();
+    int _v_len2 = 0;
+    if (_v_len1 < _v_len2)
+    {
+      throw new RefalException (_c_50);
+    }
+    int _v_len__stub1 = (_v_len1 - _v_len2);
+    int _v_len3 = _v_deref__arg12.length ();
+    int _v_len4 = 0;
+    if (_v_len3 < _v_len4)
+    {
+      throw new RefalException (_c_50);
+    }
+    int _v_len__stub2 = (_v_len3 - _v_len4);
+    Expr _v_stub1 = Expr.empty;
+    _v_stub1 = _v_deref__arg1.subexpr (0, _v_len__stub1);
+    Expr _v_stub2 = Expr.empty;
+    _v_stub2 = _v_deref__arg12.subexpr (0, _v_len__stub2);
+    if (!refal.plus.Compare.Gt (_v_stub1, _v_stub2))
+    {
+      return false;
+    }
+    _v_res1.assign (Expr.empty);
+    return true;
+  }
+
   static  boolean Lt_0 (Expr _ge_arg1, Result _v_res1) throws RefalException
   {
@@ -2566 +2608 @@
     Expr _v_deref__arg1 = (Expr) _ge_arg1.at (0);
     Expr _v_deref__arg12 = (Expr) _ge_arg1.at ((0 + 1));
-    int _v_len1 = _v_deref__arg12.length ();
+    int _v_len1 = _v_deref__arg1.length ();
     int _v_len2 = 0;
     if (_v_len1 < _v_len2)
@@ -2573 +2615 @@
     }
     int _v_len__stub1 = (_v_len1 - _v_len2);
-    int _v_len3 = _v_deref__arg1.length ();
+    int _v_len3 = _v_deref__arg12.length ();
     int _v_len4 = 0;
     if (_v_len3 < _v_len4)
@@ -2580 +2622 @@
     }
     int _v_len__stub2 = (_v_len3 - _v_len4);
+    Expr _v_stub1 = Expr.empty;
+    _v_stub1 = _v_deref__arg1.subexpr (0, _v_len__stub1);
     Expr _v_stub2 = Expr.empty;
-    _v_stub2 = _v_deref__arg1.subexpr (0, _v_len__stub2);
-    Expr _v_stub1 = Expr.empty;
-    _v_stub1 = _v_deref__arg12.subexpr (0, _v_len__stub1);
-    if (!refal.plus.Compare.Lt (_v_stub2, _v_stub1))
+    _v_stub2 = _v_deref__arg12.subexpr (0, _v_len__stub2);
+    if (!refal.plus.Compare.Lt (_v_stub1, _v_stub2))
     {
       return false;
@@ -2608 +2650 @@
     Expr _v_deref__arg1 = (Expr) _ge_arg1.at (0);
     Expr _v_deref__arg12 = (Expr) _ge_arg1.at ((0 + 1));
-    int _v_len1 = _v_deref__arg12.length ();
+    int _v_len1 = _v_deref__arg1.length ();
     int _v_len2 = 0;
     if (_v_len1 < _v_len2)
@@ -2615 +2657 @@
     }
     int _v_len__stub1 = (_v_len1 - _v_len2);
-    int _v_len3 = _v_deref__arg1.length ();
+    int _v_len3 = _v_deref__arg12.length ();
     int _v_len4 = 0;
     if (_v_len3 < _v_len4)
@@ -2622 +2664 @@
     }
     int _v_len__stub2 = (_v_len3 - _v_len4);
+    Expr _v_stub1 = Expr.empty;
+    _v_stub1 = _v_deref__arg1.subexpr (0, _v_len__stub1);
     Expr _v_stub2 = Expr.empty;
-    _v_stub2 = _v_deref__arg1.subexpr (0, _v_len__stub2);
-    Expr _v_stub1 = Expr.empty;
-    _v_stub1 = _v_deref__arg12.subexpr (0, _v_len__stub1);
-    if (!refal.plus.Compare.Ne (_v_stub2, _v_stub1))
-    {
-      return false;
-    }
-    _v_res1.assign (Expr.empty);
-    return true;
-  }
-
-  static  boolean Gt_0 (Expr _ge_arg1, Result _v_res1) throws RefalException
-  {
-    if (_ge_arg1.length () != 2)
-    {
-      throw new RefalException (_c_50);
-    }
-    if (_ge_arg1.isSymbolAt (0))
-    {
-      throw new RefalException (_c_50);
-    }
-    if (_ge_arg1.isSymbolAt ((0 + 1)))
-    {
-      throw new RefalException (_c_50);
-    }
-    Expr _v_deref__arg1 = (Expr) _ge_arg1.at (0);
-    Expr _v_deref__arg12 = (Expr) _ge_arg1.at ((0 + 1));
-    int _v_len1 = _v_deref__arg12.length ();
-    int _v_len2 = 0;
-    if (_v_len1 < _v_len2)
-    {
-      throw new RefalException (_c_50);
-    }
-    int _v_len__stub1 = (_v_len1 - _v_len2);
-    int _v_len3 = _v_deref__arg1.length ();
-    int _v_len4 = 0;
-    if (_v_len3 < _v_len4)
-    {
-      throw new RefalException (_c_50);
-    }
-    int _v_len__stub2 = (_v_len3 - _v_len4);
-    Expr _v_stub2 = Expr.empty;
-    _v_stub2 = _v_deref__arg1.subexpr (0, _v_len__stub2);
-    Expr _v_stub1 = Expr.empty;
-    _v_stub1 = _v_deref__arg12.subexpr (0, _v_len__stub1);
-    if (!refal.plus.Compare.Gt (_v_stub2, _v_stub1))
+    _v_stub2 = _v_deref__arg12.subexpr (0, _v_len__stub2);
+    if (!refal.plus.Compare.Ne (_v_stub1, _v_stub2))
     {
       return false;

to-imperative/trunk/java/compiler/org/refal/plus/compiler/rfp_asail_cpp.java

@@ -48 +48 @@
   static  final Expr _c_8 = _c_47.subexpr (3, 1);
   static  final Expr _c_9 = Expr.fromSequence ("static void init_ () {");
-  static  final Expr _c_10 = new Expr ((Comparable) _c_183);
+  static  final Expr _c_10 = new Expr ((Comparable<?>) _c_183);
   static  final Expr _c_11 = new Expr (Symbol.newWord ("STATIC"));
   static  final Expr _c_12 = new Expr (Symbol.newWord ("DECL-OBJ"));
-  static  final Expr _c_13 = _c_183.subexpr (41, 1);
+  static  final Expr _c_13 = _c_6.subexpr (1, 1);
   static  final Expr _c_14 = Expr.fromSequence (" = ");
   static  final Expr _c_184 = Expr.fromSequence ("#include <rf_core.hh>");
   static  final Expr _c_185 = Expr.fromSequence ("using namespace rfrt;");
-  static  final Expr _c_15 = Expr.concat ((Comparable) _c_184, (Comparable) _c_185);
+  static  final Expr _c_15 = Expr.concat ((Comparable<?>) _c_184, (Comparable<?>) _c_185);
   static  final Expr _c_16 = new Expr (Symbol.newWord ("UNDEF"));
   static  final Expr _c_17 = new Expr (Symbol.newWord ("NATIVE"));
@@ -72 +72 @@
   static  final Expr _c_26 = new Expr (Symbol.newWord ("FUNC?"));
   static  final Expr _c_27 = Expr.getConcatenator (4).toRight (Symbol.newWord ("org")).toRight (Symbol.newWord ("refal")).toRight (Symbol.newWord ("plus")).toRight (Symbol.newWord ("wrappers")).yield ();
-  static  final Expr _c_28 = _c_7.subexpr (14, 1);
+  static  final Expr _c_28 = _c_184.subexpr (12, 1);
   static  final Expr _c_29 = new Expr (Symbol.newWord ("TRACEALL"));
   static  final Expr _c_30 = _c_184.subexpr (17, 1);
   static  final Expr _c_31 = new Expr (Symbol.newWord ("DECL-FUNC"));
   static  final Expr _c_32 = Expr.fromSequence ("RF_ARG ");
-  static  final Expr _c_163 = Expr.concat ((Comparable) Expr.empty, Symbol.newWord ("Vars"));
+  static  final Expr _c_163 = Expr.concat ((Comparable<?>) Expr.empty, Symbol.newWord ("Vars"));
   static  final Expr _c_33 = _c_163.subexpr (1, 1);
   static  final Expr _c_34 = Expr.fromSequence ("RF_RES ");
@@ -87 +87 @@
   static  final Expr _c_39 = new Expr (Symbol.newWord ("TRACE"));
   static  final Expr _c_40 = new Expr (Symbol.newWord ("IF-INT-CMP"));
-  static  final Expr _c_41 = _c_37.subexpr (1, 1);
+  static  final Expr _c_41 = _c_14.subexpr (0, 1);
   static  final Expr _c_92 = Expr.fromSequence ("if (RF_CALL (");
   static  final Expr _c_42 = _c_92.subexpr (0, 4);
@@ -96 +96 @@
   static  final Expr _c_48 = Expr.fromSequence ("for ( ; ; ");
   static  final Expr _c_49 = new Expr (Symbol.newWord ("TRY"));
-  static  final Expr _c_50 = new Expr ((Comparable) Expr.fromSequence ("RF_TRAP"));
+  static  final Expr _c_50 = new Expr ((Comparable<?>) Expr.fromSequence ("RF_TRAP"));
   static  final Expr _c_51 = new Expr (Symbol.newWord ("CATCH-ERROR"));
-  static  final Expr _c_52 = new Expr ((Comparable) Expr.fromSequence ("RF_CLEANUP;"));
-  static  final Expr _c_53 = new Expr ((Comparable) Expr.fromSequence ("RF_WITH"));
+  static  final Expr _c_52 = new Expr ((Comparable<?>) Expr.fromSequence ("RF_CLEANUP;"));
+  static  final Expr _c_53 = new Expr ((Comparable<?>) Expr.fromSequence ("RF_WITH"));
   static  final Expr _c_54 = new Expr (Symbol.newWord ("RETFAIL"));
   static  final Expr _c_186 = Expr.fromSequence ("else RF_RETFAIL;");
-  static  final Expr _c_55 = new Expr ((Comparable) _c_186.subexpr (5, 11));
+  static  final Expr _c_55 = new Expr ((Comparable<?>) _c_186.subexpr (5, 11));
   static  final Expr _c_56 = new Expr (Symbol.newWord ("FATAL"));
-  static  final Expr _c_57 = new Expr ((Comparable) Expr.fromSequence ("RF_FUNC_ERROR (unexpected_fail);"));
+  static  final Expr _c_57 = new Expr ((Comparable<?>) Expr.fromSequence ("RF_FUNC_ERROR (unexpected_fail);"));
   static  final Expr _c_58 = new Expr (Symbol.newWord ("LSPLIT"));
   static  final Expr _c_59 = Expr.fromSequence ("RF_lsplit (");
@@ -114 +114 @@
   static  final Expr _c_86 = Expr.fromSequence ("extern Expr ");
   static  final Expr _c_65 = _c_86.subexpr (7, 5);
-  static  final Expr _c_66 = _c_42.subexpr (2, 2);
+  static  final Expr _c_66 = _c_38.subexpr (7, 2);
   static  final Expr _c_67 = new Expr (Symbol.newWord ("DROP"));
   static  final Expr _c_68 = Expr.fromSequence (".drop ();");
@@ -122 +122 @@
   static  final Expr _c_72 = Expr.fromSequence ("RF_ERROR (");
   static  final Expr _c_74 = _c_163.subexpr (0, 1);
-  static  final Expr _c_76 = _c_75.subexpr (0, 1);
+  static  final Expr _c_76 = _c_73.subexpr (0, 1);
   static  final Expr _c_77 = _c_183.subexpr (0, 7);
   static  final Expr _c_78 = new Expr (new Func () {
@@ -147 +147 @@
   static  final Expr _c_90 = new Expr (Symbol.newWord ("Exprs"));
   static  final Expr _c_91 = _c_172.subexpr (32, 2);
-  static  final Expr _c_93 = new Expr ((Comparable) Expr.fromSequence ("return true;"));
-  static  final Expr _c_94 = new Expr ((Comparable) _c_186);
+  static  final Expr _c_93 = new Expr ((Comparable<?>) Expr.fromSequence ("return true;"));
+  static  final Expr _c_94 = new Expr ((Comparable<?>) _c_186);
   static  final Expr _c_95 = new Expr (Symbol.newWord ("TAILCALL?"));
   static  final Expr _c_96 = new Expr (Symbol.newWord ("TAILCALL"));
-  static  final Expr _c_97 = _c_35.subexpr (0, 3);
+  static  final Expr _c_97 = _c_32.subexpr (0, 3);
   static  final Expr _c_98 = Expr.fromSequence ("empty");
   static  final Expr _c_99 = new Expr (new Func () {
@@ -169 +169 @@
   static  final Expr _c_108 = new Expr (Symbol.newWord ("ERROR-EXPR"));
   static  final Expr _c_109 = Expr.fromSequence ("err");
-  static  final Expr _c_110 = _c_7.subexpr (4, 2);
+  static  final Expr _c_110 = _c_83.subexpr (4, 2);
   static  final Expr _c_151 = Expr.fromSequence (" + Expr::create<rftype::Word>(\"");
   static  final Expr _c_113 = _c_151.subexpr (3, 28);
@@ -202 +202 @@
   static  final Expr _c_135 = Expr.fromSequence (".term_eq (");
   static  final Expr _c_136 = new Expr (Symbol.newWord ("NOT"));
-  static  final Expr _c_137 = _c_131.subexpr (0, 1);
+  static  final Expr _c_137 = _c_125.subexpr (0, 1);
   static  final Expr _c_138 = new Expr (Symbol.newWord ("INC-ITER"));
   static  final Expr _c_139 = Expr.fromSequence (")++");
@@ -224 +224 @@
   static  final Expr _c_158 = Expr.fromSequence ("\r");
   static  final Expr _c_159 = Expr.fromSequence ("\\r");
-  static  final Expr _c_160 = _c_82.subexpr (0, 1);
+  static  final Expr _c_160 = _c_151.subexpr (30, 1);
   static  final Expr _c_161 = Expr.fromSequence ("\\\"");
   static  final Expr _c_162 = Expr.fromSequence ("RF_VOID");
@@ -230 +230 @@
   static  final Expr _c_165 = Expr.fromSequence (";;)");
   static  final Expr _c_166 = _c_27.subexpr (1, 2);
-  static  final Expr _c_167 = _c_166.subexpr (0, 1);
+  static  final Expr _c_167 = _c_27.subexpr (1, 1);
   static  final Expr _c_168 = _c_47.subexpr (1, 2);
   static  final Expr _c_169 = _c_185.subexpr (6, 10);
-  static  final Expr _c_170 = new Expr ((Comparable) _c_8);
+  static  final Expr _c_170 = new Expr ((Comparable<?>) _c_8);
   static  final Expr _c_171 = new Expr (new Func () {
     public boolean eval (Expr arg, Result res) throws RefalException {
@@ -307 +307 @@
         break _block2;
       }
-      refal.plus.Box.Store (Entry, new Expr ((Comparable) Expr.concat (_ve_ModuleName, _c_4)));
+      refal.plus.Box.Store (Entry, new Expr ((Comparable<?>) Expr.concat (_ve_ModuleName, _c_4)));
     }
     refal.plus.Box.Store (Entry_Name, Expr.empty);
@@ -365 +365 @@
             Expr _vv_name = Expr.empty;
             _vv_name = _v_Get1.getExpr ().subexpr (0, _v_len__name);
-            _ve_entry = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_7).toRight (_vv_name).toRight (_c_6).yield ());
+            _ve_entry = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_7).toRight (_vv_name).toRight (_c_6).yield ());
             break _block4;
           }
@@ -404 +404 @@
                   break _block3__branch1;
                 }
-                _ve_init = Expr.getConcatenator ().toRight (_ve_nc.getExpr ()).toRight ((Comparable) Expr.getConcatenator ().toRight (_c_9).toRight ((Comparable) _ve_init__consts).toRight (_c_8).yield ()).toRight (_c_10).toRight (_v_Map2.getExpr ()).yield ();
+                _ve_init = Expr.getConcatenator ().toRight (_ve_nc.getExpr ()).toRight ((Comparable<?>) Expr.getConcatenator ().toRight (_c_9).toRight ((Comparable<?>) _ve_init__consts).toRight (_c_8).yield ()).toRight (_c_10).toRight (_v_Map2.getExpr ()).yield ();
                 break _exit__iter1;
               }
@@ -471 +471 @@
                 _ge_name__8 = _va_2.getExpr ();
               }
-              _ve_init__consts = Expr.concat (_ve_init__consts, (Comparable) Expr.getConcatenator ().toRight (_ge_name__8).toRight (_c_14).toRight (_ve_value).toRight (_c_13).yield ());
+              _ve_init__consts = Expr.concat (_ve_init__consts, (Comparable<?>) Expr.getConcatenator ().toRight (_ge_name__8).toRight (_c_14).toRight (_ve_value).toRight (_c_13).yield ());
               _ve_c__exprs = _ve_rest;
             }
@@ -582 +582 @@
             }
             int _v_len__name = (_v_len7 - _v_len8);
-            int _v_len9 = _v_deref__deref__item23.length ();
+            int _v_len9 = _v_deref__deref__item22.length ();
             int _v_len10 = 0;
             if (_v_len9 < _v_len10)
@@ -588 +588 @@
               break _block2__branch2;
             }
-            int _v_len__out = (_v_len9 - _v_len10);
-            int _v_len11 = _v_deref__deref__item22.length ();
+            int _v_len__in = (_v_len9 - _v_len10);
+            int _v_len11 = _v_deref__deref__item23.length ();
             int _v_len12 = 0;
             if (_v_len11 < _v_len12)
@@ -595 +595 @@
               break _block2__branch2;
             }
-            int _v_len__in = (_v_len11 - _v_len12);
+            int _v_len__out = (_v_len11 - _v_len12);
             if (!_c_17.termEquals (_v_deref__item2, 0))
             {
@@ -665 +665 @@
             _vs__dollar_tmp_m_126_m_74 = _v_Del__Pragmas2.getExpr ().subexpr ((0 + _v_len__rfRes), 1);
             Result _va_3 = new Result ();
-            ASAIL_To_CPP (new Expr ((Comparable) Expr.getConcatenator ().toRight (_vs_tag).toRight (_c_23).toRight ((Comparable) _ve_name).toRight ((Comparable) _ve_rfArg).toRight ((Comparable) _ve_rfRes).toRight ((Comparable) Expr.getConcatenator ().toRight (_c_22).toRight (_ve_name).toRight (_c_21).yield ()).yield ()), _va_3);
+            ASAIL_To_CPP (new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_vs_tag).toRight (_c_23).toRight ((Comparable<?>) _ve_name).toRight ((Comparable<?>) _ve_rfArg).toRight ((Comparable<?>) _ve_rfRes).toRight ((Comparable<?>) Expr.getConcatenator ().toRight (_c_22).toRight (_ve_name).toRight (_c_21).yield ()).yield ()), _va_3);
             _ve_cpp__item = _va_3.getExpr ();
             break _block2;
@@ -742 +742 @@
             Result _gs_auxcall8 = new Result (Expr.empty);
             refal.plus.Convert.ToWord (_ge_auxcall7.getExpr (), _gs_auxcall8);
-            refal.plus.Table.Bind (Unavailable_Imports, _ve_name, Expr.getConcatenator ().toRight (_vs_tag).toRight (_c_23).toRight ((Comparable) _gs_auxcall8.getExpr ()).toRight (_vt_args).toRight (_vt_ress).toRight ((Comparable) Expr.getConcatenator ().toRight (_c_22).toRight (_ve_n).toRight (_c_21).yield ()).yield ());
+            refal.plus.Table.Bind (Unavailable_Imports, _ve_name, Expr.getConcatenator ().toRight (_vs_tag).toRight (_c_23).toRight ((Comparable<?>) _gs_auxcall8.getExpr ()).toRight (_vt_args).toRight (_vt_ress).toRight ((Comparable<?>) Expr.getConcatenator ().toRight (_c_22).toRight (_ve_n).toRight (_c_21).yield ()).yield ());
             _ve_cpp__item = Expr.empty;
             break _block2;
@@ -769 +769 @@
             Expr _v_deref__deref__item4 = (Expr) _v_deref__item4.at ((0 + 1 + 1 + 1));
             Expr _v_deref__deref__item42 = (Expr) _v_deref__item4.at ((0 + 1 + 1 + 1 + 1));
-            int _v_len25 = _v_deref__deref__item42.length ();
+            int _v_len25 = _v_deref__deref__item4.length ();
             int _v_len26 = 0;
             if (_v_len25 < _v_len26)
@@ -775 +775 @@
               break _block2__branch4;
             }
-            int _v_len__ress = (_v_len25 - _v_len26);
-            int _v_len27 = _v_deref__deref__item4.length ();
+            int _v_len__args = (_v_len25 - _v_len26);
+            int _v_len27 = _v_deref__deref__item42.length ();
             int _v_len28 = 0;
             if (_v_len27 < _v_len28)
@@ -782 +782 @@
               break _block2__branch4;
             }
-            int _v_len__args = (_v_len27 - _v_len28);
+            int _v_len__ress = (_v_len27 - _v_len28);
             if (!_v_deref__item4.isSymbolAt (0))
             {
@@ -878 +878 @@
                 Result _ge_name__6 = new Result (Expr.empty);
                 refal.plus.List.Intersperse (_c_30, _ge_auxcall11.getExpr (), _ge_name__6);
-                refal.plus.Box.Store (Current_Trace, Expr.concat (_ge_name__6.getExpr (), (Comparable) _ve_ress));
+                refal.plus.Box.Store (Current_Trace, Expr.concat (_ge_name__6.getExpr (), (Comparable<?>) _ve_ress));
                 Result _ge_auxcall12 = new Result (Expr.empty);
                 Trace_Enter (_ge_name__6.getExpr (), _ve_args, _ge_auxcall12);
@@ -904 +904 @@
             Result _ge_auxcall18 = new Result (Expr.empty);
             ASAIL_To_CPP (_ve_body, _ge_auxcall18);
-            _ve_cpp__item = Expr.concat (_ge_auxcall14.getExpr (), (Comparable) Expr.getConcatenator ().toRight (_c_38).toRight (_ge_auxcall15.getExpr ()).toRight (_c_37).toRight (_ge_auxcall16.getExpr ()).toRight (_c_37).toRight (_ge_auxcall17.getExpr ()).toRight (_c_36).toRight ((Comparable) Expr.getConcatenator ().toRight (_ve_trace__enter).toRight (_ge_auxcall18.getExpr ()).toRight (_ve_trace__exit).yield ()).toRight (_c_35).yield ());
+            _ve_cpp__item = Expr.concat (_ge_auxcall14.getExpr (), (Comparable<?>) Expr.getConcatenator ().toRight (_c_38).toRight (_ge_auxcall15.getExpr ()).toRight (_c_37).toRight (_ge_auxcall16.getExpr ()).toRight (_c_37).toRight (_ge_auxcall17.getExpr ()).toRight (_c_36).toRight ((Comparable<?>) Expr.getConcatenator ().toRight (_ve_trace__enter).toRight (_ge_auxcall18.getExpr ()).toRight (_ve_trace__exit).yield ()).toRight (_c_35).yield ());
             break _block2;
           }
@@ -950 +950 @@
             Expr _v_deref__deref__item6 = (Expr) _v_deref__item6.at ((0 + 1 + 1));
             Expr _v_deref__deref__item62 = (Expr) _v_deref__item6.at ((0 + 1 + 1 + 1));
-            int _v_len33 = _v_deref__deref__item62.length ();
+            int _v_len33 = _v_deref__deref__item6.length ();
             int _v_len34 = 0;
             if (_v_len33 < _v_len34)
@@ -956 +956 @@
               break _block2__branch6;
             }
-            int _v_len__arg2 = (_v_len33 - _v_len34);
-            int _v_len35 = _v_deref__deref__item6.length ();
+            int _v_len__arg1 = (_v_len33 - _v_len34);
+            int _v_len35 = _v_deref__deref__item62.length ();
             int _v_len36 = 0;
             if (_v_len35 < _v_len36)
@@ -963 +963 @@
               break _block2__branch6;
             }
-            int _v_len__arg1 = (_v_len35 - _v_len36);
+            int _v_len__arg2 = (_v_len35 - _v_len36);
             if (!_c_40.termEquals (_v_deref__item6, 0))
             {
@@ -986 +986 @@
             Result _ge_auxcall21 = new Result (Expr.empty);
             ASAIL_To_CPP (_ve_body, _ge_auxcall21);
-            _ve_cpp__item = Expr.concat ((Comparable) Expr.getConcatenator ().toRight (_c_42).toRight (_ge_auxcall19.getExpr ()).toRight (_c_41).toRight (_vs_op).toRight (_c_41).toRight (_ge_auxcall20.getExpr ()).toRight (_c_36).yield (), (Comparable) Expr.getConcatenator ().toRight (_c_43).toRight ((Comparable) _ge_auxcall21.getExpr ()).toRight (_c_8).yield ());
+            _ve_cpp__item = Expr.concat ((Comparable<?>) Expr.getConcatenator ().toRight (_c_42).toRight (_ge_auxcall19.getExpr ()).toRight (_c_41).toRight (_vs_op).toRight (_c_41).toRight (_ge_auxcall20.getExpr ()).toRight (_c_36).yield (), (Comparable<?>) Expr.getConcatenator ().toRight (_c_43).toRight ((Comparable<?>) _ge_auxcall21.getExpr ()).toRight (_c_8).yield ());
             break _block2;
           }
@@ -1014 +1014 @@
             Result _ge_auxcall23 = new Result (Expr.empty);
             ASAIL_To_CPP (_ve_body, _ge_auxcall23);
-            _ve_cpp__item = Expr.concat ((Comparable) Expr.getConcatenator ().toRight (_c_42).toRight (_ge_auxcall22.getExpr ()).toRight (_c_36).yield (), (Comparable) Expr.getConcatenator ().toRight (_c_43).toRight ((Comparable) _ge_auxcall23.getExpr ()).toRight (_c_8).yield ());
+            _ve_cpp__item = Expr.concat ((Comparable<?>) Expr.getConcatenator ().toRight (_c_42).toRight (_ge_auxcall22.getExpr ()).toRight (_c_36).yield (), (Comparable<?>) Expr.getConcatenator ().toRight (_c_43).toRight ((Comparable<?>) _ge_auxcall23.getExpr ()).toRight (_c_8).yield ());
             break _block2;
           }
@@ -1064 +1064 @@
             }
             int _v_len__break__label = (_v_len43 - _v_len44);
-            int _v_len45 = _v_deref__deref__item84.length ();
+            int _v_len45 = _v_deref__deref__item83.length ();
             int _v_len46 = 0;
             if (_v_len45 < _v_len46)
@@ -1070 +1070 @@
               break _block2__branch8;
             }
-            int _v_len__step = (_v_len45 - _v_len46);
-            int _v_len47 = _v_deref__deref__item83.length ();
+            int _v_len__cond = (_v_len45 - _v_len46);
+            int _v_len47 = _v_deref__deref__item84.length ();
             int _v_len48 = 0;
             if (_v_len47 < _v_len48)
@@ -1077 +1077 @@
               break _block2__branch8;
             }
-            int _v_len__cond = (_v_len47 - _v_len48);
+            int _v_len__step = (_v_len47 - _v_len48);
             if (!_c_45.termEquals (_v_deref__item8, 0))
             {
@@ -1104 +1104 @@
                 ASAIL_To_CPP (_ve_body, _ge_auxcall24);
                 Result _ge_auxcall25 = new Result (Expr.empty);
-                refal.plus.CppMangle.Rfp2Cpp (new Expr ((Comparable) Expr.concat (_c_46, _ve_cont__label)), _ge_auxcall25);
-                _ge_body__5 = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_43).toRight ((Comparable) Expr.getConcatenator ().toRight (_c_43).toRight ((Comparable) _ge_auxcall24.getExpr ()).toRight (_c_8).yield ()).toRight ((Comparable) Expr.getConcatenator ().toRight (_c_46).toRight (_ge_auxcall25.getExpr ()).toRight (_c_47).yield ()).toRight (_c_8).yield ());
+                refal.plus.CppMangle.Rfp2Cpp (new Expr ((Comparable<?>) Expr.concat (_c_46, _ve_cont__label)), _ge_auxcall25);
+                _ge_body__5 = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_43).toRight ((Comparable<?>) Expr.getConcatenator ().toRight (_c_43).toRight ((Comparable<?>) _ge_auxcall24.getExpr ()).toRight (_c_8).yield ()).toRight ((Comparable<?>) Expr.getConcatenator ().toRight (_c_46).toRight (_ge_auxcall25.getExpr ()).toRight (_c_47).yield ()).toRight (_c_8).yield ());
                 break _block8;
               }
               Result _ge_auxcall26 = new Result (Expr.empty);
               ASAIL_To_CPP (_ve_body, _ge_auxcall26);
-              _ge_body__5 = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_43).toRight ((Comparable) _ge_auxcall26.getExpr ()).toRight (_c_8).yield ());
+              _ge_body__5 = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_43).toRight ((Comparable<?>) _ge_auxcall26.getExpr ()).toRight (_c_8).yield ());
             }
             Expr _ve_break = Expr.empty;
@@ -1122 +1122 @@
                 _vt__dollar_tmp_m_174_m_26 = _ve_break__label.subexpr (0, 1);
                 Result _ge_auxcall27 = new Result (Expr.empty);
-                refal.plus.CppMangle.Rfp2Cpp (new Expr ((Comparable) Expr.concat (_c_46, _ve_break__label)), _ge_auxcall27);
-                _ve_break = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_46).toRight (_ge_auxcall27.getExpr ()).toRight (_c_47).yield ());
+                refal.plus.CppMangle.Rfp2Cpp (new Expr ((Comparable<?>) Expr.concat (_c_46, _ve_break__label)), _ge_auxcall27);
+                _ve_break = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_46).toRight (_ge_auxcall27.getExpr ()).toRight (_c_47).yield ());
                 break _block9;
               }
@@ -1130 +1130 @@
             Result _ge_auxcall28 = new Result (Expr.empty);
             Step_To_CPP (_ve_step, _ge_auxcall28);
-            _ve_cpp__item = Expr.getConcatenator ().toRight ((Comparable) Expr.getConcatenator ().toRight (_c_48).toRight (_ge_auxcall28.getExpr ()).toRight (_c_36).yield ()).toRight (_ge_body__5).toRight (_ve_break).yield ();
+            _ve_cpp__item = Expr.getConcatenator ().toRight ((Comparable<?>) Expr.getConcatenator ().toRight (_c_48).toRight (_ge_auxcall28.getExpr ()).toRight (_c_36).yield ()).toRight (_ge_body__5).toRight (_ve_break).yield ();
             break _block2;
           }
@@ -1169 +1169 @@
             ASAIL_To_CPP (_ve_body, _ge_auxcall29);
             Result _ge_auxcall30 = new Result (Expr.empty);
-            refal.plus.CppMangle.Rfp2Cpp (new Expr ((Comparable) Expr.concat (_c_46, _ve_label)), _ge_auxcall30);
-            _ve_cpp__item = Expr.concat ((Comparable) Expr.getConcatenator ().toRight (_c_43).toRight ((Comparable) _ge_auxcall29.getExpr ()).toRight (_c_8).yield (), (Comparable) Expr.getConcatenator ().toRight (_c_46).toRight (_ge_auxcall30.getExpr ()).toRight (_c_47).yield ());
+            refal.plus.CppMangle.Rfp2Cpp (new Expr ((Comparable<?>) Expr.concat (_c_46, _ve_label)), _ge_auxcall30);
+            _ve_cpp__item = Expr.concat ((Comparable<?>) Expr.getConcatenator ().toRight (_c_43).toRight ((Comparable<?>) _ge_auxcall29.getExpr ()).toRight (_c_8).yield (), (Comparable<?>) Expr.getConcatenator ().toRight (_c_46).toRight (_ge_auxcall30.getExpr ()).toRight (_c_47).yield ());
             break _block2;
           }
@@ -1194 +1194 @@
             Result _ge_auxcall31 = new Result (Expr.empty);
             ASAIL_To_CPP (_ve_body, _ge_auxcall31);
-            _ve_cpp__item = Expr.concat (_c_50, (Comparable) Expr.getConcatenator ().toRight (_c_43).toRight ((Comparable) _ge_auxcall31.getExpr ()).toRight (_c_8).yield ());
+            _ve_cpp__item = Expr.concat (_c_50, (Comparable<?>) Expr.getConcatenator ().toRight (_c_43).toRight ((Comparable<?>) _ge_auxcall31.getExpr ()).toRight (_c_8).yield ());
             break _block2;
           }
@@ -1218 +1218 @@
             Result _ge_auxcall32 = new Result (Expr.empty);
             ASAIL_To_CPP (_ve_body, _ge_auxcall32);
-            _ve_cpp__item = Expr.concat (_c_53, (Comparable) Expr.getConcatenator ().toRight (_c_43).toRight ((Comparable) Expr.concat (_c_52, _ge_auxcall32.getExpr ())).toRight (_c_8).yield ());
+            _ve_cpp__item = Expr.concat (_c_53, (Comparable<?>) Expr.getConcatenator ().toRight (_c_43).toRight ((Comparable<?>) Expr.concat (_c_52, _ge_auxcall32.getExpr ())).toRight (_c_8).yield ());
             break _block2;
           }
@@ -1317 +1317 @@
             Result _ge_auxcall36 = new Result (Expr.empty);
             refal.plus.CppMangle.Rfp2Cpp (_vt_var2, _ge_auxcall36);
-            _ve_cpp__item = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_59).toRight (_ge_auxcall33.getExpr ()).toRight (_c_37).toRight (_ge_auxcall34.getExpr ()).toRight (_c_37).toRight (_ge_auxcall35.getExpr ()).toRight (_c_37).toRight (_ge_auxcall36.getExpr ()).toRight (_c_6).yield ());
+            _ve_cpp__item = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_59).toRight (_ge_auxcall33.getExpr ()).toRight (_c_37).toRight (_ge_auxcall34.getExpr ()).toRight (_c_37).toRight (_ge_auxcall35.getExpr ()).toRight (_c_37).toRight (_ge_auxcall36.getExpr ()).toRight (_c_6).yield ());
             break _block2;
           }
@@ -1365 +1365 @@
             Result _ge_auxcall40 = new Result (Expr.empty);
             refal.plus.CppMangle.Rfp2Cpp (_vt_var2, _ge_auxcall40);
-            _ve_cpp__item = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_61).toRight (_ge_auxcall37.getExpr ()).toRight (_c_37).toRight (_ge_auxcall38.getExpr ()).toRight (_c_37).toRight (_ge_auxcall39.getExpr ()).toRight (_c_37).toRight (_ge_auxcall40.getExpr ()).toRight (_c_6).yield ());
+            _ve_cpp__item = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_61).toRight (_ge_auxcall37.getExpr ()).toRight (_c_37).toRight (_ge_auxcall38.getExpr ()).toRight (_c_37).toRight (_ge_auxcall39.getExpr ()).toRight (_c_37).toRight (_ge_auxcall40.getExpr ()).toRight (_c_6).yield ());
             break _block2;
           }
@@ -1411 +1411 @@
             Result _ge_auxcall42 = new Result (Expr.empty);
             Expr_Int_To_CPP (_ve_expr, _ge_auxcall42);
-            _ve_cpp__item = new Expr ((Comparable) Expr.getConcatenator ().toRight (_ge_auxcall41.getExpr ()).toRight (_c_14).toRight (_ge_auxcall42.getExpr ()).toRight (_c_13).yield ());
+            _ve_cpp__item = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_ge_auxcall41.getExpr ()).toRight (_c_14).toRight (_ge_auxcall42.getExpr ()).toRight (_c_13).yield ());
             break _block2;
           }
@@ -1439 +1439 @@
             Result _ge_auxcall44 = new Result (Expr.empty);
             Expr_Ref_To_CPP (_ve_expr, _ge_auxcall44);
-            _ve_cpp__item = new Expr ((Comparable) Expr.getConcatenator ().toRight (_ge_auxcall43.getExpr ()).toRight (_c_14).toRight (_ge_auxcall44.getExpr ()).toRight (_c_13).yield ());
+            _ve_cpp__item = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_ge_auxcall43.getExpr ()).toRight (_c_14).toRight (_ge_auxcall44.getExpr ()).toRight (_c_13).yield ());
             break _block2;
           }
@@ -1485 +1485 @@
             Result _ge_auxcall46 = new Result (Expr.empty);
             Expr_Int_To_CPP (_ve_expr, _ge_auxcall46);
-            _ve_cpp__item = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_64).toRight (_ge_auxcall45.getExpr ()).toRight (_c_14).toRight (_ge_auxcall46.getExpr ()).toRight (_c_13).yield ());
+            _ve_cpp__item = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_64).toRight (_ge_auxcall45.getExpr ()).toRight (_c_14).toRight (_ge_auxcall46.getExpr ()).toRight (_c_13).yield ());
             break _block2;
           }
@@ -1512 +1512 @@
             Result _ge_auxcall47 = new Result (Expr.empty);
             refal.plus.CppMangle.Rfp2Cpp (_vt_var, _ge_auxcall47);
-            _ve_cpp__item = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_65).toRight (_ge_auxcall47.getExpr ()).toRight (_c_13).yield ());
+            _ve_cpp__item = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_65).toRight (_ge_auxcall47.getExpr ()).toRight (_c_13).yield ());
             break _block2;
           }
@@ -1546 +1546 @@
             Result _ge_auxcall49 = new Result (Expr.empty);
             Expr_Ref_To_CPP (_ve_expr, _ge_auxcall49);
-            _ve_cpp__item = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_65).toRight (_ge_auxcall48.getExpr ()).toRight (_c_66).toRight (_ge_auxcall49.getExpr ()).toRight (_c_6).yield ());
+            _ve_cpp__item = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_65).toRight (_ge_auxcall48.getExpr ()).toRight (_c_66).toRight (_ge_auxcall49.getExpr ()).toRight (_c_6).yield ());
             break _block2;
           }
@@ -1567 +1567 @@
             Result _ge_auxcall50 = new Result (Expr.empty);
             refal.plus.CppMangle.Rfp2Cpp (_vt_var, _ge_auxcall50);
-            _ve_cpp__item = new Expr ((Comparable) Expr.concat (_ge_auxcall50.getExpr (), _c_68));
+            _ve_cpp__item = new Expr ((Comparable<?>) Expr.concat (_ge_auxcall50.getExpr (), _c_68));
             break _block2;
           }
@@ -1587 +1587 @@
             _vt_label = _v_deref__item20.subexpr ((0 + 1), 1);
             Result _ge_auxcall51 = new Result (Expr.empty);
-            refal.plus.CppMangle.Rfp2Cpp (new Expr ((Comparable) Expr.concat (_c_46, _vt_label)), _ge_auxcall51);
-            _ve_cpp__item = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_70).toRight (_ge_auxcall51.getExpr ()).toRight (_c_13).yield ());
+            refal.plus.CppMangle.Rfp2Cpp (new Expr ((Comparable<?>) Expr.concat (_c_46, _vt_label)), _ge_auxcall51);
+            _ve_cpp__item = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_70).toRight (_ge_auxcall51.getExpr ()).toRight (_c_13).yield ());
             break _block2;
           }
@@ -1608 +1608 @@
             _vt_label = _v_deref__item21.subexpr ((0 + 1), 1);
             Result _ge_auxcall52 = new Result (Expr.empty);
-            refal.plus.CppMangle.Rfp2Cpp (new Expr ((Comparable) Expr.concat (_c_46, _vt_label)), _ge_auxcall52);
-            _ve_cpp__item = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_70).toRight (_ge_auxcall52.getExpr ()).toRight (_c_13).yield ());
+            refal.plus.CppMangle.Rfp2Cpp (new Expr ((Comparable<?>) Expr.concat (_c_46, _vt_label)), _ge_auxcall52);
+            _ve_cpp__item = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_70).toRight (_ge_auxcall52.getExpr ()).toRight (_c_13).yield ());
             break _block2;
           }
@@ -1633 +1633 @@
             Result _ge_auxcall53 = new Result (Expr.empty);
             Expr_Ref_To_CPP (_ve_expr, _ge_auxcall53);
-            _ve_cpp__item = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_72).toRight (_ge_auxcall53.getExpr ()).toRight (_c_6).yield ());
+            _ve_cpp__item = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_72).toRight (_ge_auxcall53.getExpr ()).toRight (_c_6).yield ());
             break _block2;
           }
@@ -1659 +1659 @@
             Expr _v_deref__deref__item232 = (Expr) _v_deref__item23.at ((0 + 1 + 1));
             Expr _v_deref__deref__item233 = (Expr) _v_deref__item23.at ((0 + 1 + 1 + 1));
-            int _v_len85 = _v_deref__deref__item233.length ();
+            int _v_len85 = _v_deref__deref__item232.length ();
             int _v_len86 = 0;
             if (_v_len85 < _v_len86)
@@ -1665 +1665 @@
               break _block2__branch25;
             }
-            int _v_len__comment = (_v_len85 - _v_len86);
-            int _v_len87 = _v_deref__deref__item232.length ();
+            int _v_len__name4 = (_v_len85 - _v_len86);
+            int _v_len87 = _v_deref__deref__item233.length ();
             int _v_len88 = 0;
             if (_v_len87 < _v_len88)
@@ -1672 +1672 @@
               break _block2__branch25;
             }
-            int _v_len__name4 = (_v_len87 - _v_len88);
+            int _v_len__comment = (_v_len87 - _v_len88);
             if (!_c_73.equals (_v_deref__item23, 0))
             {
@@ -1700 +1700 @@
             Result _gs_auxcall55 = new Result (Expr.empty);
             refal.plus.Convert.ToWord (_ge_auxcall54.getExpr (), _gs_auxcall55);
-            refal.plus.Table.Bind (Unavailable_Imports, _ve_name, Expr.getConcatenator ().toRight (_c_75).toRight ((Comparable) _gs_auxcall55.getExpr ()).toRight (_c_74).toRight (_ve_expr).yield ());
+            refal.plus.Table.Bind (Unavailable_Imports, _ve_name, Expr.getConcatenator ().toRight (_c_75).toRight ((Comparable<?>) _gs_auxcall55.getExpr ()).toRight (_c_74).toRight (_ve_expr).yield ());
             _ve_cpp__item = Expr.empty;
             break _block2;
@@ -1800 +1800 @@
             Result _ge_auxcall59 = new Result (Expr.empty);
             Const_Expr_To_CPP (_ve_expr, _ge_auxcall59);
-            refal.plus.Box.Put (Const_Exprs, new Expr ((Comparable) Expr.concat (_vt_name, (Comparable) _ge_auxcall59.getExpr ())));
+            refal.plus.Box.Put (Const_Exprs, new Expr ((Comparable<?>) Expr.concat (_vt_name, (Comparable<?>) _ge_auxcall59.getExpr ())));
             Result _ge_auxcall60 = new Result (Expr.empty);
             Namespace_Control (_ve_qualifiers, _ge_auxcall60);
@@ -1808 +1808 @@
               break _block1__branch1;
             }
-            _ve_cpp__item = Expr.concat (_ge_auxcall60.getExpr (), (Comparable) Expr.getConcatenator ().toRight (_ge_linkage__5).toRight (_c_65).toRight (_ge_auxcall61.getExpr ()).toRight (_c_13).yield ());
+            _ve_cpp__item = Expr.concat (_ge_auxcall60.getExpr (), (Comparable<?>) Expr.getConcatenator ().toRight (_ge_linkage__5).toRight (_c_65).toRight (_ge_auxcall61.getExpr ()).toRight (_c_13).yield ());
             break _block2;
           }
@@ -1878 +1878 @@
                   break _block14__branch1;
                 }
-                refal.plus.Box.Put (Const_Exprs, new Expr ((Comparable) Expr.concat (_vt_name, (Comparable) Expr.getConcatenator ().toRight (_c_83).toRight (_ve_n.getExpr ()).toRight (_c_82).yield ())));
+                refal.plus.Box.Put (Const_Exprs, new Expr ((Comparable<?>) Expr.concat (_vt_name, (Comparable<?>) Expr.getConcatenator ().toRight (_c_83).toRight (_ve_n.getExpr ()).toRight (_c_82).yield ())));
                 break _block14;
               }
               Result _ge_auxcall62 = new Result (Expr.empty);
               refal.plus.Convert.ToLower (_ve_2, _ge_auxcall62);
-              refal.plus.Box.Put (Const_Exprs, new Expr ((Comparable) Expr.concat (_vt_name, (Comparable) Expr.getConcatenator ().toRight (_c_85).toRight (_vs_1).toRight (_ge_auxcall62.getExpr ()).toRight (_c_84).toRight (_ve_n.getExpr ()).toRight (_c_82).yield ())));
+              refal.plus.Box.Put (Const_Exprs, new Expr ((Comparable<?>) Expr.concat (_vt_name, (Comparable<?>) Expr.getConcatenator ().toRight (_c_85).toRight (_vs_1).toRight (_ge_auxcall62.getExpr ()).toRight (_c_84).toRight (_ve_n.getExpr ()).toRight (_c_82).yield ())));
             }
             Result _ge_auxcall63 = new Result (Expr.empty);
@@ -1889 +1889 @@
             Result _ge_auxcall64 = new Result (Expr.empty);
             Name_To_CPP (_c_12, _vt_name, _ge_auxcall64);
-            _ve_cpp__item = Expr.concat (_ge_auxcall63.getExpr (), (Comparable) Expr.getConcatenator ().toRight (_ge_linkage__5).toRight (_c_65).toRight (_ge_auxcall64.getExpr ()).toRight (_c_13).yield ());
+            _ve_cpp__item = Expr.concat (_ge_auxcall63.getExpr (), (Comparable<?>) Expr.getConcatenator ().toRight (_ge_linkage__5).toRight (_c_65).toRight (_ge_auxcall64.getExpr ()).toRight (_c_13).yield ());
             break _block2;
           }
@@ -1915 +1915 @@
             Result _ge_auxcall66 = new Result (Expr.empty);
             Name_To_CPP (_c_12, _vt_name, _ge_auxcall66);
-            _ve_cpp__item = Expr.concat (_ge_auxcall65.getExpr (), (Comparable) Expr.getConcatenator ().toRight (_c_86).toRight (_ge_auxcall66.getExpr ()).toRight (_c_13).yield ());
+            _ve_cpp__item = Expr.concat (_ge_auxcall65.getExpr (), (Comparable<?>) Expr.getConcatenator ().toRight (_c_86).toRight (_ge_auxcall66.getExpr ()).toRight (_c_13).yield ());
             break _block2;
           }
@@ -1941 +1941 @@
             Result _ge_auxcall68 = new Result (Expr.empty);
             Name_To_CPP (_c_31, _vt_name, _ge_auxcall68);
-            _ve_cpp__item = Expr.concat (_ge_auxcall67.getExpr (), (Comparable) Expr.getConcatenator ().toRight (_c_87).toRight (_ge_auxcall68.getExpr ()).toRight (_c_6).yield ());
+            _ve_cpp__item = Expr.concat (_ge_auxcall67.getExpr (), (Comparable<?>) Expr.getConcatenator ().toRight (_c_87).toRight (_ge_auxcall68.getExpr ()).toRight (_c_6).yield ());
             break _block2;
           }
@@ -1968 +1968 @@
             Result _ge_auxcall70 = new Result (Expr.empty);
             Name_To_CPP (_c_31, _vt_name, _ge_auxcall70);
-            _ve_cpp__item = Expr.concat (_ge_auxcall69.getExpr (), (Comparable) Expr.getConcatenator ().toRight (_c_87).toRight (_ge_auxcall70.getExpr ()).toRight (_c_6).yield ());
+            _ve_cpp__item = Expr.concat (_ge_auxcall69.getExpr (), (Comparable<?>) Expr.getConcatenator ().toRight (_c_87).toRight (_ge_auxcall70.getExpr ()).toRight (_c_6).yield ());
             break _block2;
           }
@@ -1990 +1990 @@
           Expr _v_deref__deref__item29 = (Expr) _v_deref__item29.at ((0 + 1 + 1));
           Expr _v_deref__deref__item292 = (Expr) _v_deref__item29.at ((0 + 1 + 1 + 1));
-          int _v_len99 = _v_deref__deref__item292.length ();
+          int _v_len99 = _v_deref__deref__item29.length ();
           int _v_len100 = 0;
           if (_v_len99 < _v_len100)
@@ -1996 +1996 @@
             throw new RefalException ("org.refal.plus.compiler.rfp_asail_cpp", "ASAIL_To_CPP", "Unexpected fail");
           }
-          int _v_len__ress3 = (_v_len99 - _v_len100);
-          int _v_len101 = _v_deref__deref__item29.length ();
+          int _v_len__exprs = (_v_len99 - _v_len100);
+          int _v_len101 = _v_deref__deref__item292.length ();
           int _v_len102 = 0;
           if (_v_len101 < _v_len102)
@@ -2003 +2003 @@
             throw new RefalException ("org.refal.plus.compiler.rfp_asail_cpp", "ASAIL_To_CPP", "Unexpected fail");
           }
-          int _v_len__exprs = (_v_len101 - _v_len102);
+          int _v_len__ress3 = (_v_len101 - _v_len102);
           if (!_v_deref__item29.isSymbolAt (0))
           {
@@ -2057 +2057 @@
               Result _ge_auxcall74 = new Result (Expr.empty);
               Trace_Exit (_ve_full__name, _ve_ress, _ge_auxcall74);
-              _ve_cpp__item = Expr.getConcatenator ().toRight ((Comparable) Expr.getConcatenator ().toRight (_c_92).toRight (_ge_auxcall71.getExpr ()).toRight (_c_37).toRight (_ge_auxcall72.getExpr ()).toRight (_c_37).toRight (_ge_auxcall73.getExpr ()).toRight (_c_91).yield ()).toRight ((Comparable) Expr.getConcatenator ().toRight (_c_43).toRight ((Comparable) Expr.concat (_ge_auxcall74.getExpr (), _c_93)).toRight (_c_8).yield ()).toRight (_c_94).yield ();
+              _ve_cpp__item = Expr.getConcatenator ().toRight ((Comparable<?>) Expr.getConcatenator ().toRight (_c_92).toRight (_ge_auxcall71.getExpr ()).toRight (_c_37).toRight (_ge_auxcall72.getExpr ()).toRight (_c_37).toRight (_ge_auxcall73.getExpr ()).toRight (_c_91).yield ()).toRight ((Comparable<?>) Expr.getConcatenator ().toRight (_c_43).toRight ((Comparable<?>) Expr.concat (_ge_auxcall74.getExpr (), _c_93)).toRight (_c_8).yield ()).toRight (_c_94).yield ();
               break _block15;
             }
@@ -2078 +2078 @@
             Result _ge_auxcall77 = new Result (Expr.empty);
             Args_To_CPP (Expr.empty, _c_33, _ve_ress, _ge_auxcall77);
-            _ve_cpp__item = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_97).toRight (_gs_call__7).toRight (_c_66).toRight (_ge_auxcall75.getExpr ()).toRight (_c_37).toRight (_ge_auxcall76.getExpr ()).toRight (_c_37).toRight (_ge_auxcall77.getExpr ()).toRight (_c_6).yield ());
+            _ve_cpp__item = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_97).toRight (_gs_call__7).toRight (_c_66).toRight (_ge_auxcall75.getExpr ()).toRight (_c_37).toRight (_ge_auxcall76.getExpr ()).toRight (_c_37).toRight (_ge_auxcall77.getExpr ()).toRight (_c_6).yield ());
           }
         }
@@ -2223 +2223 @@
         Expr _v_deref__deref__arg13 = (Expr) _v_deref__arg13.at ((0 + 1 + _v_len__expr3));
         Expr _v_deref__deref__arg132 = (Expr) _v_deref__arg13.at ((0 + 1 + _v_len__expr3 + 1));
-        int _v_len9 = _v_deref__deref__arg132.length ();
+        int _v_len9 = _v_deref__deref__arg13.length ();
         int _v_len10 = 0;
         if (_v_len9 < _v_len10)
@@ -2229 +2229 @@
           break _block1__branch3;
         }
-        int _v_len__len = (_v_len9 - _v_len10);
-        int _v_len11 = _v_deref__deref__arg13.length ();
+        int _v_len__pos2 = (_v_len9 - _v_len10);
+        int _v_len11 = _v_deref__deref__arg132.length ();
         int _v_len12 = 0;
         if (_v_len11 < _v_len12)
@@ -2236 +2236 @@
           break _block1__branch3;
         }
-        int _v_len__pos2 = (_v_len11 - _v_len12);
+        int _v_len__len = (_v_len11 - _v_len12);
         if (!_c_106.termEquals (_v_deref__arg13, 0))
         {
@@ -2334 +2334 @@
         }
         Result _v_Rfp2Cpp1 = new Result (Expr.empty);
-        refal.plus.CppMangle.Rfp2Cpp (new Expr ((Comparable) Expr.concat (_c_11, _vt_name)), _v_Rfp2Cpp1);
+        refal.plus.CppMangle.Rfp2Cpp (new Expr ((Comparable<?>) Expr.concat (_c_11, _vt_name)), _v_Rfp2Cpp1);
         _v_res1.assign (Expr.concat (_ve_prefix, _v_Rfp2Cpp1.getExpr ()));
         break _block1;
@@ -2365 +2365 @@
         Expr _vt_name = Expr.empty;
         _vt_name = _v_deref__arg16.subexpr ((0 + 1 + _v_len__ns), 1);
-        refal.plus.CppMangle.Rfp2Cpp (new Expr ((Comparable) Expr.getConcatenator ().toRight (_vs_var__tag).toRight (_ve_ns).toRight (_vt_name).yield ()), _v_res1);
+        refal.plus.CppMangle.Rfp2Cpp (new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_vs_var__tag).toRight (_ve_ns).toRight (_vt_name).yield ()), _v_res1);
         break _block1;
       }
@@ -2432 +2432 @@
             break _block2;
           }
-          throw new RefalException (new Expr ((Comparable) Expr.concat (_c_114, _vs_ObjectSymbol)));
+          throw new RefalException (new Expr ((Comparable<?>) Expr.concat (_c_114, _vs_ObjectSymbol)));
         }
         break _block1;
@@ -2599 +2599 @@
         Expr _vt_name = Expr.empty;
         _vt_name = _v_deref__arg16.subexpr ((0 + 1), 1);
-        refal.plus.CppMangle.Rfp2Cpp (new Expr ((Comparable) Expr.concat (_vs_var__tag, _vt_name)), _v_res1);
+        refal.plus.CppMangle.Rfp2Cpp (new Expr ((Comparable<?>) Expr.concat (_vs_var__tag, _vt_name)), _v_res1);
         break _block1;
       }
@@ -2643 +2643 @@
         Expr _v_deref__deref__deref__arg1 = (Expr) _v_deref__deref__arg1.at ((0 + 1 + 1));
         Expr _v_deref__deref__deref__arg12 = (Expr) _v_deref__deref__arg1.at ((0 + 1 + 1 + 1));
-        int _v_len1 = _v_deref__deref__deref__arg12.length ();
+        int _v_len1 = _v_deref__deref__deref__arg1.length ();
         int _v_len2 = 0;
         if (_v_len1 < _v_len2)
@@ -2649 +2649 @@
           break _block1__branch1;
         }
-        int _v_len__ress = (_v_len1 - _v_len2);
-        int _v_len3 = _v_deref__deref__deref__arg1.length ();
+        int _v_len__exprs = (_v_len1 - _v_len2);
+        int _v_len3 = _v_deref__deref__deref__arg12.length ();
         int _v_len4 = 0;
         if (_v_len3 < _v_len4)
@@ -2656 +2656 @@
           break _block1__branch1;
         }
-        int _v_len__exprs = (_v_len3 - _v_len4);
+        int _v_len__ress = (_v_len3 - _v_len4);
         if (!_c_124.termEquals (_v_deref__arg1, 0))
         {
@@ -2743 +2743 @@
         Expr _v_deref__deref__arg13 = (Expr) _v_deref__arg13.at ((0 + 1 + _v_len__expr2));
         Expr _v_deref__deref__arg132 = (Expr) _v_deref__arg13.at ((0 + 1 + _v_len__expr2 + 1));
-        int _v_len11 = _v_deref__deref__arg132.length ();
+        int _v_len11 = _v_deref__deref__arg13.length ();
         int _v_len12 = 0;
         if (_v_len11 < _v_len12)
@@ -2749 +2749 @@
           break _block1__branch3;
         }
-        int _v_len__len = (_v_len11 - _v_len12);
-        int _v_len13 = _v_deref__deref__arg13.length ();
+        int _v_len__pos2 = (_v_len11 - _v_len12);
+        int _v_len13 = _v_deref__deref__arg132.length ();
         int _v_len14 = 0;
         if (_v_len13 < _v_len14)
@@ -2756 +2756 @@
           break _block1__branch3;
         }
-        int _v_len__pos2 = (_v_len13 - _v_len14);
+        int _v_len__len = (_v_len13 - _v_len14);
         if (!_c_128.termEquals (_v_deref__arg13, 0))
         {
@@ -2823 +2823 @@
         Expr _v_deref__deref__arg15 = (Expr) _v_deref__arg15.at ((0 + 1 + _v_len__expr1));
         Expr _v_deref__deref__arg152 = (Expr) _v_deref__arg15.at ((0 + 1 + _v_len__expr1 + 1));
-        int _v_len19 = _v_deref__deref__arg152.length ();
+        int _v_len19 = _v_deref__deref__arg15.length ();
         int _v_len20 = 0;
         if (_v_len19 < _v_len20)
@@ -2829 +2829 @@
           break _block1__branch5;
         }
-        int _v_len__pos3 = (_v_len19 - _v_len20);
-        int _v_len21 = _v_deref__deref__arg15.length ();
+        int _v_len__expr22 = (_v_len19 - _v_len20);
+        int _v_len21 = _v_deref__deref__arg152.length ();
         int _v_len22 = 0;
         if (_v_len21 < _v_len22)
@@ -2836 +2836 @@
           break _block1__branch5;
         }
-        int _v_len__expr22 = (_v_len21 - _v_len22);
+        int _v_len__pos3 = (_v_len21 - _v_len22);
         if (!_c_132.termEquals (_v_deref__arg15, 0))
         {
@@ -2879 +2879 @@
         Expr _v_deref__deref__arg16 = (Expr) _v_deref__arg16.at ((0 + 1 + _v_len__expr12));
         Expr _v_deref__deref__arg162 = (Expr) _v_deref__arg16.at ((0 + 1 + _v_len__expr12 + 1));
-        int _v_len25 = _v_deref__deref__arg162.length ();
+        int _v_len25 = _v_deref__deref__arg16.length ();
         int _v_len26 = 0;
         if (_v_len25 < _v_len26)
@@ -2885 +2885 @@
           break _block1__branch6;
         }
-        int _v_len__pos4 = (_v_len25 - _v_len26);
-        int _v_len27 = _v_deref__deref__arg16.length ();
+        int _v_len__expr23 = (_v_len25 - _v_len26);
+        int _v_len27 = _v_deref__deref__arg162.length ();
         int _v_len28 = 0;
         if (_v_len27 < _v_len28)
@@ -2892 +2892 @@
           break _block1__branch6;
         }
-        int _v_len__expr23 = (_v_len27 - _v_len28);
+        int _v_len__pos4 = (_v_len27 - _v_len28);
         if (!_c_134.termEquals (_v_deref__arg16, 0))
         {
@@ -2972 +2972 @@
         _block2: {
           _block2__branch1: {
-            int _v_len5 = _ve_rest.length ();
+            int _v_len5 = _ve_arg.length ();
             int _v_len6 = 0;
             if (_v_len5 < (_v_len6 + 1))
@@ -2978 +2978 @@
               break _block2__branch1;
             }
-            int _v_len___dollar_tmp_m_368_m_28 = (_v_len5 - _v_len6);
-            int _v_len7 = _ve_arg.length ();
+            int _v_len___dollar_tmp_m_368_m_16 = (_v_len5 - _v_len6);
+            int _v_len7 = _ve_rest.length ();
             int _v_len8 = 0;
             if (_v_len7 < (_v_len8 + 1))
@@ -2985 +2985 @@
               break _block2__branch1;
             }
-            int _v_len___dollar_tmp_m_368_m_16 = (_v_len7 - _v_len8);
+            int _v_len___dollar_tmp_m_368_m_28 = (_v_len7 - _v_len8);
             Expr _vv__dollar_tmp_m_368_m_16 = Expr.empty;
             _vv__dollar_tmp_m_368_m_16 = _ve_arg.subexpr (0, _v_len___dollar_tmp_m_368_m_16);
@@ -3201 +3201 @@
         Result _ge_auxcall1 = new Result (Expr.empty);
         Symbol_To_CPP (_vs_sym, _ge_auxcall1);
-        Const_Expr_Aux (Expr.concat ((Comparable) Expr.concat (_ve_accum, _ge_auxcall1.getExpr ()), _ve_rest), _v_res1);
+        Const_Expr_Aux (Expr.concat ((Comparable<?>) Expr.concat (_ve_accum, _ge_auxcall1.getExpr ()), _ve_rest), _v_res1);
         break _block1;
       }
@@ -3513 +3513 @@
           break _block1__branch1;
         }
-        Expr _v_compose1 = Expr.getConcatenator ().toRight ((Comparable) _ge_arg1).toRight (_gs_arg2).toRight (_ge_arg3).yield ();
+        Expr _v_compose1 = Expr.getConcatenator ().toRight ((Comparable<?>) _ge_arg1).toRight (_gs_arg2).toRight (_ge_arg3).yield ();
         if (_v_compose1.isSymbolAt (0))
         {
@@ -3540 +3540 @@
           break _block1__branch2;
         }
-        Expr _v_compose2 = Expr.getConcatenator ().toRight ((Comparable) _ge_arg1).toRight (_gs_arg2).toRight (_ge_arg3).yield ();
+        Expr _v_compose2 = Expr.getConcatenator ().toRight ((Comparable<?>) _ge_arg1).toRight (_gs_arg2).toRight (_ge_arg3).yield ();
         if (!_c_163.equals (_v_compose2, 0))
         {
@@ -3553 +3553 @@
           break _block1__branch3;
         }
-        Expr _v_compose3 = Expr.getConcatenator ().toRight ((Comparable) _ge_arg1).toRight (_gs_arg2).toRight (_ge_arg3).yield ();
+        Expr _v_compose3 = Expr.getConcatenator ().toRight ((Comparable<?>) _ge_arg1).toRight (_gs_arg2).toRight (_ge_arg3).yield ();
         if (_v_compose3.isSymbolAt ((0 + 1 + 1)))
         {
@@ -3572 +3572 @@
         Expr _ve_arg = Expr.empty;
         _ve_arg = _v_deref__compose3.subexpr (0, _v_len__arg);
-        refal.plus.CppMangle.Rfp2Cpp (new Expr ((Comparable) _ve_arg), _v_res1);
+        refal.plus.CppMangle.Rfp2Cpp (new Expr ((Comparable<?>) _ve_arg), _v_res1);
         break _block1;
       }
@@ -3580 +3580 @@
           break _block1__branch4;
         }
-        Expr _v_compose4 = Expr.getConcatenator ().toRight ((Comparable) _ge_arg1).toRight (_gs_arg2).toRight (_ge_arg3).yield ();
+        Expr _v_compose4 = Expr.getConcatenator ().toRight ((Comparable<?>) _ge_arg1).toRight (_gs_arg2).toRight (_ge_arg3).yield ();
         if (_v_compose4.isSymbolAt (0))
         {
@@ -3607 +3607 @@
           break _block1__branch5;
         }
-        Expr _v_compose5 = Expr.getConcatenator ().toRight ((Comparable) _ge_arg1).toRight (_gs_arg2).toRight (_ge_arg3).yield ();
+        Expr _v_compose5 = Expr.getConcatenator ().toRight ((Comparable<?>) _ge_arg1).toRight (_gs_arg2).toRight (_ge_arg3).yield ();
         if (_v_compose5.isSymbolAt (0))
         {
@@ -3618 +3618 @@
         Expr _v_deref__compose5 = (Expr) _v_compose5.at (0);
         Expr _v_deref__compose52 = (Expr) _v_compose5.at ((0 + 1 + 1));
-        int _v_len7 = _v_deref__compose52.length ();
+        int _v_len7 = _v_deref__compose5.length ();
         int _v_len8 = 0;
         if (_v_len7 < _v_len8)
@@ -3624 +3624 @@
           break _block1__branch5;
         }
-        int _v_len__arg2 = (_v_len7 - _v_len8);
-        int _v_len9 = _v_deref__compose5.length ();
+        int _v_len__prefix3 = (_v_len7 - _v_len8);
+        int _v_len9 = _v_deref__compose52.length ();
         int _v_len10 = 0;
         if (_v_len9 < _v_len10)
@@ -3631 +3631 @@
           break _block1__branch5;
         }
-        int _v_len__prefix3 = (_v_len9 - _v_len10);
+        int _v_len__arg2 = (_v_len9 - _v_len10);
         if (!_c_90.termEquals (_v_compose5, (0 + 1)))
         {
@@ -3654 +3654 @@
           _block2: {
             _block2__branch1: {
-              Expr _v_compose6 = Expr.concat ((Comparable) _ge_arg1, _gs_arg2);
+              Expr _v_compose6 = Expr.concat ((Comparable<?>) _ge_arg1, _gs_arg2);
               if (!_c_90.termEquals (_v_compose6, (0 + 1)))
               {
@@ -3665 +3665 @@
             }
             _block2__branch2: {
-              Expr _v_compose7 = Expr.concat ((Comparable) _ge_arg1, _gs_arg2);
+              Expr _v_compose7 = Expr.concat ((Comparable<?>) _ge_arg1, _gs_arg2);
               if (!_c_163.equals (_v_compose7, 0))
               {
@@ -3674 +3674 @@
             }
             _block2__branch3: {
-              Expr _v_compose8 = Expr.concat ((Comparable) _ge_arg1, _gs_arg2);
+              Expr _v_compose8 = Expr.concat ((Comparable<?>) _ge_arg1, _gs_arg2);
               if (_v_compose8.isSymbolAt (0))
               {
@@ -3703 +3703 @@
             }
             int _v_len___dollar_tmp_m_474_m_8 = (_v_len13 - _v_len14);
-            Expr _v_compose9 = Expr.concat ((Comparable) _ge_arg1, _gs_arg2);
+            Expr _v_compose9 = Expr.concat ((Comparable<?>) _ge_arg1, _gs_arg2);
             Expr _ve__dollar_tmp_m_474_m_8 = Expr.empty;
             _ve__dollar_tmp_m_474_m_8 = _v_compose9.subexpr (0, _v_len___dollar_tmp_m_474_m_8);
@@ -3757 +3757 @@
             }
             Result _ge_auxcall1 = new Result (Expr.empty);
-            refal.plus.CppMangle.Rfp2Cpp (new Expr ((Comparable) _ve_arg), _ge_auxcall1);
+            refal.plus.CppMangle.Rfp2Cpp (new Expr ((Comparable<?>) _ve_arg), _ge_auxcall1);
             _ge_arg3__2 = _ve_rest;
             _ve_cpp__args = Expr.getConcatenator ().toRight (_ve_cpp__args).toRight (_ge_auxcall1.getExpr ()).toRight (_ve_comma).yield ();
@@ -3854 +3854 @@
         Expr _ve_cont = Expr.empty;
         _ve_cont = _ve_name.subexpr ((0 + 1 + 1), _v_len__cont2);
-        refal.plus.Table.Bind (Decls, Expr.concat (_vs_decl__type, (Comparable) Expr.concat (_c_167, _ve_cont)), Expr.empty);
+        refal.plus.Table.Bind (Decls, Expr.concat (_vs_decl__type, (Comparable<?>) Expr.concat (_c_167, _ve_cont)), Expr.empty);
         QName_To_Cpp (Expr.concat (_c_167, _ve_cont), _v_res1);
         break _block1;
@@ -3860 +3860 @@
       Result _ve_namespace = new Result (Expr.empty);
       refal.plus.Box.Get (Current_Namespace, _ve_namespace);
-      refal.plus.Table.Bind (Decls, Expr.concat (_vs_decl__type, (Comparable) _ve_name), Expr.empty);
+      refal.plus.Table.Bind (Decls, Expr.concat (_vs_decl__type, (Comparable<?>) _ve_name), Expr.empty);
       _block2: {
         _block2__branch1: {
@@ -3893 +3893 @@
   static  void Open_Namespace (Expr _ve_name, Result _v_res1) throws RefalException
   {
-    _v_res1.assign (new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_169).toRight (_ve_name).toRight (_c_168).yield ()));
+    _v_res1.assign (new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_169).toRight (_ve_name).toRight (_c_168).yield ()));
   }
 
@@ -3976 +3976 @@
           break _iter1;
         }
-        _v_res1.assign (Expr.concat ((Comparable) Expr.getConcatenator ().toRight (_c_173).toRight (_ve_name).toRight (_c_172).yield (), _ve_pr__args));
+        _v_res1.assign (Expr.concat ((Comparable<?>) Expr.getConcatenator ().toRight (_c_173).toRight (_ve_name).toRight (_c_172).yield (), _ve_pr__args));
         break _exit__iter1;
       }
@@ -4022 +4022 @@
       _ge_args__0 = _ve_rest;
       _vs_n = _gs_auxcall1.getExpr ();
-      _ve_pr__args = Expr.concat (_ve_pr__args, (Comparable) Expr.getConcatenator ().toRight (_c_177).toRight (_ve_num).toRight (_c_66).toRight (_ge_auxcall2.getExpr ()).toRight (_c_176).yield ());
+      _ve_pr__args = Expr.concat (_ve_pr__args, (Comparable<?>) Expr.getConcatenator ().toRight (_c_177).toRight (_ve_num).toRight (_c_66).toRight (_ge_auxcall2.getExpr ()).toRight (_c_176).yield ());
     }
   }
@@ -4039 +4039 @@
           break _iter1;
         }
-        _v_res1.assign (Expr.concat ((Comparable) Expr.getConcatenator ().toRight (_c_178).toRight (_ve_name).toRight (_c_172).yield (), _ve_pr__args));
+        _v_res1.assign (Expr.concat ((Comparable<?>) Expr.getConcatenator ().toRight (_c_178).toRight (_ve_name).toRight (_c_172).yield (), _ve_pr__args));
         break _exit__iter1;
       }
@@ -4085 +4085 @@
       _ge_args__0 = _ve_rest;
       _vs_n = _gs_auxcall1.getExpr ();
-      _ve_pr__args = Expr.concat (_ve_pr__args, (Comparable) Expr.getConcatenator ().toRight (_c_180).toRight (_ve_num).toRight (_c_66).toRight (_ge_auxcall2.getExpr ()).toRight (_c_179).yield ());
+      _ve_pr__args = Expr.concat (_ve_pr__args, (Comparable<?>) Expr.getConcatenator ().toRight (_c_180).toRight (_ve_num).toRight (_c_66).toRight (_ge_auxcall2.getExpr ()).toRight (_c_179).yield ());
     }
   }
@@ -4092 +4092 @@
   static  void Trace_Fail (Expr _ve_name, Result _v_res1) throws RefalException
   {
-    _v_res1.assign (new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_181).toRight (_ve_name).toRight (_c_172).yield ()));
+    _v_res1.assign (new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_181).toRight (_ve_name).toRight (_c_172).yield ()));
   }
 

to-imperative/trunk/java/compiler/org/refal/plus/compiler/rfp_asail_java.java

@@ -39 +39 @@
   static  final Expr _c_10 = Expr.fromSequence (" (new Result ());");
   static  final Expr _c_11 = Expr.fromSequence ("try {");
-  static  final Expr _c_231 = Expr.fromSequence ("java.lang.System.out.println (\"$error: \" + e);");
-  static  final Expr _c_12 = Expr.getConcatenator (30).toRight (Expr.fromSequence ("} catch (RefalException e) {")).toRight ((Comparable) Expr.concat ((Comparable) _c_231, (Comparable) Expr.fromSequence ("java.lang.System.exit (100);"))).toRight (Expr.fromSequence ("}")).yield ();
+  static  final Expr _c_210 = Expr.fromSequence ("java.lang.System.out.println (\"$error: \" + e);");
+  static  final Expr _c_12 = Expr.getConcatenator (30).toRight (Expr.fromSequence ("} catch (RefalException e) {")).toRight ((Comparable<?>) Expr.concat ((Comparable<?>) _c_210, (Comparable<?>) Expr.fromSequence ("java.lang.System.exit (100);"))).toRight (Expr.fromSequence ("}")).yield ();
   static  final Expr _c_13 = Expr.fromSequence ("public void run () {");
   static  final Expr _c_14 = _c_12.subexpr (0, 1);
@@ -47 +47 @@
   static  final Expr _c_17 = Expr.fromSequence ("new Thread(");
   static  final Expr _c_18 = Expr.fromSequence ("public static void main (final java.lang.String[] args) {");
-  static  final Expr _c_19 = new Expr ((Comparable) Expr.empty);
-  static  final Expr _c_20 = _c_11.subexpr (3, 2);
+  static  final Expr _c_19 = new Expr ((Comparable<?>) Expr.empty);
+  static  final Expr _c_20 = _c_16.subexpr (14, 2);
   static  final Expr _c_21 = Expr.fromSequence ("public class ");
-  static  final Expr _c_22 = new Expr ((Comparable) Expr.fromSequence ("import org.refal.plus.*;"));
-  static  final Expr _c_23 = _c_231.subexpr (30, 1);
+  static  final Expr _c_22 = new Expr ((Comparable<?>) Expr.fromSequence ("import org.refal.plus.*;"));
+  static  final Expr _c_23 = _c_8.subexpr (0, 1);
   static  final Expr _c_24 = Expr.fromSequence ("\\\"");
   static  final Expr _c_26 = Expr.fromSequence ("\\'");
@@ -58 +58 @@
   static  final Expr _c_28 = new Expr (Symbol.newWord ("NATIVE"));
   static  final Expr _c_29 = new Expr (Symbol.newWord ("FUNC"));
-  static  final Expr _c_30 = _c_13.subexpr (7, 4);
+  static  final Expr _c_30 = _c_18.subexpr (14, 4);
   static  final Expr _c_31 = new Expr (Symbol.newWord ("FUNC?"));
   static  final Expr _c_160 = Expr.fromSequence ("public boolean eval (Expr arg, Result res) throws RefalException {");
   static  final Expr _c_32 = _c_160.subexpr (7, 7);
-  static  final Expr _c_232 = Expr.fromSequence ("return true;");
-  static  final Expr _c_33 = new Expr ((Comparable) _c_232);
+  static  final Expr _c_33 = new Expr ((Comparable<?>) Expr.fromSequence ("return true;"));
   static  final Expr _c_61 = Expr.fromSequence ("\", \"This is for avoiding 'Unreachable code' errors\");");
   static  final Expr _c_34 = _c_61.subexpr (50, 2);
@@ -70 +69 @@
   static  final Expr _c_37 = new Expr (Symbol.newWord ("Expr"));
   static  final Expr _c_38 = _c_160.subexpr (41, 23);
-  static  final Expr _c_39 = _c_13.subexpr (15, 2);
+  static  final Expr _c_39 = _c_10.subexpr (0, 2);
   static  final Expr _c_40 = _c_39.subexpr (0, 1);
   static  final Expr _c_41 = _c_18.subexpr (7, 7);
-  static  final Expr _c_42 = _c_11.subexpr (4, 1);
+  static  final Expr _c_42 = _c_20.subexpr (1, 1);
   static  final Expr _c_43 = new Expr (Symbol.newWord ("TRACE"));
   static  final Expr _c_44 = new Expr (Symbol.newWord ("IF-INT-CMP"));
-  static  final Expr _c_45 = _c_34.subexpr (1, 1);
+  static  final Expr _c_45 = _c_10.subexpr (14, 1);
   static  final Expr _c_64 = Expr.fromSequence ("if (false)");
   static  final Expr _c_46 = _c_64.subexpr (0, 4);
@@ -83 +82 @@
   static  final Expr _c_49 = new Expr (Symbol.newWord ("FOR"));
   static  final Expr _c_50 = new Expr (Symbol.newWord ("LABEL"));
-  static  final Expr _c_51 = _c_231.subexpr (37, 2);
+  static  final Expr _c_51 = _c_210.subexpr (37, 2);
   static  final Expr _c_52 = new Expr (Symbol.newWord ("INC-ITER"));
   static  final Expr _c_53 = new Expr (Symbol.newWord ("DEC-ITER"));
   static  final Expr _c_54 = Expr.fromSequence (".getLeft();");
-  static  final Expr _c_233 = Expr.fromSequence ("Expr err = error.getExpr ();");
-  static  final Expr _c_55 = _c_233.subexpr (8, 3);
-  static  final Expr _c_56 = _c_233.subexpr (0, 5);
+  static  final Expr _c_211 = Expr.fromSequence ("Expr err = error.getExpr ();");
+  static  final Expr _c_55 = _c_211.subexpr (8, 3);
+  static  final Expr _c_56 = _c_211.subexpr (0, 5);
   static  final Expr _c_57 = Expr.fromSequence (".getRight();");
   static  final Expr _c_58 = Expr.fromSequence ("for ( ; ; ");
@@ -96 +95 @@
   static  final Expr _c_62 = _c_61.subexpr (0, 4);
   static  final Expr _c_63 = Expr.fromSequence ("throw new RefalException (\"");
-  static  final Expr _c_65 = new Expr ((Comparable) _c_11.subexpr (0, 3));
+  static  final Expr _c_65 = new Expr ((Comparable<?>) _c_11.subexpr (0, 3));
   static  final Expr _c_66 = new Expr (Symbol.newWord ("CATCH-ERROR"));
-  static  final Expr _c_67 = new Expr ((Comparable) _c_233);
+  static  final Expr _c_67 = new Expr ((Comparable<?>) _c_211);
   static  final Expr _c_68 = Expr.fromSequence ("catch (RefalException error) {");
   static  final Expr _c_69 = new Expr (Symbol.newWord ("RETFAIL"));
-  static  final Expr _c_234 = Expr.fromSequence ("return false;");
-  static  final Expr _c_104 = Expr.getConcatenator (5).toRight (Expr.fromSequence (") {")).toRight ((Comparable) _c_234).toRight (Expr.fromSequence ("}")).yield ();
+  static  final Expr _c_212 = Expr.fromSequence ("return false;");
+  static  final Expr _c_104 = Expr.getConcatenator (5).toRight (Expr.fromSequence (") {")).toRight ((Comparable<?>) _c_212).toRight (Expr.fromSequence ("}")).yield ();
   static  final Expr _c_70 = _c_104.subexpr (3, 1);
   static  final Expr _c_71 = new Expr (Symbol.newWord ("FATAL"));
@@ -108 +107 @@
   static  final Expr _c_73 = new Expr (Symbol.newWord ("LSPLIT"));
   static  final Expr _c_74 = Expr.fromSequence ("_va_");
-  static  final Expr _c_75 = _c_54.subexpr (9, 2);
+  static  final Expr _c_75 = _c_10.subexpr (15, 2);
   static  final Expr _c_76 = Expr.fromSequence (".leftSplit(");
   static  final Expr _c_77 = Expr.fromSequence ("Expr.SplitIterator ");
@@ -114 +113 @@
   static  final Expr _c_79 = Expr.fromSequence (".rightSplit(");
   static  final Expr _c_80 = new Expr (Symbol.newWord ("DECL"));
-  static  final Expr _c_216 = Expr.fromSequence ("for (int i = 0; i < tmp_");
-  static  final Expr _c_203 = _c_216.subexpr (0, 20);
-  static  final Expr _c_81 = _c_203.subexpr (5, 4);
+  static  final Expr _c_81 = Expr.fromSequence ("int ");
   static  final Expr _c_82 = new Expr (Symbol.newWord ("ASSIGN"));
   static  final Expr _c_107 = Expr.fromSequence (" = new Result ();");
   static  final Expr _c_83 = _c_107.subexpr (0, 15);
-  static  final Expr _c_84 = _c_83.subexpr (7, 7);
+  static  final Expr _c_84 = _c_10.subexpr (6, 7);
   static  final Expr _c_85 = Expr.fromSequence (".assign (");
   static  final Expr _c_86 = new Expr (Symbol.newWord ("DROP"));
@@ -135 +132 @@
   static  final Expr _c_97 = new Expr (Symbol.newWord ("OBJ"));
   static  final Expr _c_98 = Expr.fromSequence ("\"));");
-  static  final Expr _c_99 = _c_63.subexpr (24, 3);
+  static  final Expr _c_99 = _c_9.subexpr (20, 3);
   static  final Expr _c_100 = Expr.fromSequence (" = new Expr (Symbol.new");
   static  final Expr _c_101 = new Expr (Symbol.newWord ("DECL-OBJ"));
@@ -141 +138 @@
   static  final Expr _c_103 = new Expr (Symbol.newWord ("TAILCALL?"));
   static  final Expr _c_105 = Expr.fromSequence ("if (!");
-  static  final Expr _c_106 = _c_233.subexpr (16, 12);
+  static  final Expr _c_106 = _c_211.subexpr (16, 12);
   static  final Expr _c_108 = Expr.fromSequence ("Expr.empty");
   static  final Expr _c_109 = new Expr (Symbol.newWord ("PAREN"));
-  static  final Expr _c_110 = Expr.fromSequence ("new Expr ((Comparable) ");
+  static  final Expr _c_110 = Expr.fromSequence ("new Expr ((Comparable<?>) ");
   static  final Expr _c_111 = _c_62.subexpr (1, 2);
   static  final Expr _c_112 = Expr.fromSequence ("Expr.concat (");
@@ -159 +156 @@
   static  final Expr _c_115 = Expr.fromSequence (".yield ()");
   static  final Expr _c_116 = Expr.fromSequence ("Expr.getConcatenator ()");
-  static  final Expr _c_117 = _c_110.subexpr (10, 13);
+  static  final Expr _c_117 = _c_110.subexpr (10, 16);
   static  final Expr _c_118 = new Expr (Symbol.newWord ("DEREF"));
   static  final Expr _c_119 = Expr.fromSequence (".at (");
@@ -167 +164 @@
   static  final Expr _c_123 = new Expr (Symbol.newWord ("REF"));
   static  final Expr _c_124 = new Expr (Symbol.newWord ("ERROR-EXPR"));
-  static  final Expr _c_125 = _c_233.subexpr (5, 3);
+  static  final Expr _c_125 = _c_61.subexpr (44, 3);
   static  final Expr _c_126 = new Expr (Symbol.newWord ("Illegal int-symbol: "));
   static  final Expr _c_127 = new Expr (Symbol.newWord ("LENGTH"));
@@ -199 +196 @@
   static  final Expr _c_150 = Expr.fromSequence (".next ()");
   static  final Expr _c_151 = Expr.fromSequence (".prev ()");
-  static  final Expr _c_152 = _c_117.subexpr (0, 12);
+  static  final Expr _c_152 = _c_117.subexpr (0, 15);
   static  final Expr _c_161 = Expr.fromSequence ("new Func () {");
   static  final Expr _c_153 = _c_161.subexpr (0, 8);
@@ -207 +204 @@
   static  final Expr _c_157 = Expr.fromSequence ("Expr.fromSequence (\"");
   static  final Expr _c_158 = Expr.fromSequence (" (arg, res);");
-  static  final Expr _c_159 = _c_232.subexpr (0, 7);
+  static  final Expr _c_159 = _c_212.subexpr (0, 7);
   static  final Expr _c_162 = Expr.fromSequence ("Symbol.newInt (\"");
   static  final Expr _c_163 = Expr.fromSequence ("Symbol.newWord (\"");
@@ -220 +217 @@
   static  final Expr _c_172 = _c_106.subexpr (0, 11);
   static  final Expr _c_173 = new Expr (Symbol.newWord ("EXPORT"));
-  static  final Expr _c_174 = _c_13.subexpr (0, 6);
+  static  final Expr _c_174 = _c_160.subexpr (0, 6);
   static  final Expr _c_175 = new Expr (Symbol.newInt ("1"));
-  static  final Expr _c_176 = new Expr (Symbol.newWord ("boolean"));
-  static  final Expr _c_177 = Expr.fromSequence ("java.lang.Boolean.parseBoolean((java.lang.String) ");
+  static  final Expr _c_176 = new Expr (Symbol.newWord ("SVAR"));
+  static  final Expr _c_177 = new Expr (Symbol.newWord ("boolean"));
   static  final Expr _c_178 = new Expr (Symbol.newWord ("char"));
-  static  final Expr _c_179 = Expr.fromSequence (").charValue()");
-  static  final Expr _c_180 = Expr.fromSequence ("((java.lang.Character) ");
-  static  final Expr _c_181 = new Expr (Symbol.newWord ("byte"));
-  static  final Expr _c_182 = Expr.fromSequence (").byteValue()");
-  static  final Expr _c_183 = Expr.fromSequence ("((java.math.BigInteger) ");
-  static  final Expr _c_184 = new Expr (Symbol.newWord ("short"));
-  static  final Expr _c_185 = Expr.fromSequence (").shortValue()");
-  static  final Expr _c_186 = new Expr (Symbol.newWord ("int"));
-  static  final Expr _c_187 = Expr.fromSequence (").intValue()");
-  static  final Expr _c_188 = new Expr (Symbol.newWord ("long"));
-  static  final Expr _c_189 = Expr.fromSequence (").longValue()");
-  static  final Expr _c_190 = Expr.fromSequence (").object : ");
-  static  final Expr _c_191 = Expr.fromSequence (" instanceof org.refal.plus.Reference) ? ((org.refal.plus.Reference) ");
-  static  final Expr _c_192 = Expr.fromSequence (") ((");
-  static  final Expr _c_193 = new Expr (Symbol.newWord ("SVAR"));
-  static  final Expr _c_194 = Expr.fromSequence (".at(0)");
-  static  final Expr _c_195 = new Expr (Symbol.newWord ("EVAR"));
-  static  final Expr _c_196 = _c_18.subexpr (47, 2);
-  static  final Expr _c_197 = Expr.fromSequence (".at(i)");
-  static  final Expr _c_198 = Expr.fromSequence (".length()];");
-  static  final Expr _c_199 = _c_196.subexpr (0, 1);
-  static  final Expr _c_200 = _c_83.subexpr (0, 7);
-  static  final Expr _c_201 = Expr.fromSequence ("[i] = ");
-  static  final Expr _c_202 = Expr.fromSequence (".length; i++)");
-  static  final Expr _c_204 = Expr.fromSequence ("java.lang.String.valueOf(");
-  static  final Expr _c_205 = Expr.fromSequence ("java.lang.Character.valueOf(");
-  static  final Expr _c_206 = Expr.fromSequence ("java.math.BigInteger.valueOf(");
-  static  final Expr _c_207 = Expr.fromSequence (">(");
-  static  final Expr _c_208 = Expr.fromSequence (") : new org.refal.plus.Reference<");
-  static  final Expr _c_209 = Expr.fromSequence (" instanceof java.lang.Comparable) ? ((java.lang.Comparable) ");
-  static  final Expr _c_217 = Expr.fromSequence (".assign(tmp_");
-  static  final Expr _c_210 = _c_217.subexpr (0, 8);
-  static  final Expr _c_211 = _c_201.subexpr (0, 3);
-  static  final Expr _c_212 = Expr.fromSequence (".length];");
-  static  final Expr _c_213 = Expr.fromSequence (" = new java.lang.Comparable[");
-  static  final Expr _c_214 = Expr.fromSequence ("java.lang.Comparable[] tmp_");
-  static  final Expr _c_215 = _c_214.subexpr (23, 4);
-  static  final Expr _c_218 = _c_158.subexpr (2, 3);
-  static  final Expr _c_219 = _c_158.subexpr (7, 3);
-  static  final Expr _c_220 = Expr.fromSequence ("convArg");
-  static  final Expr _c_221 = Expr.fromSequence ("convRes");
-  static  final Expr _c_222 = new Expr (Symbol.newWord (""));
-  static  final Expr _c_223 = _c_200.subexpr (3, 4);
-  static  final Expr _c_224 = _c_220.subexpr (4, 1);
-  static  final Expr _c_225 = Expr.fromSequence ("\", e.toString());");
-  static  final Expr _c_226 = Expr.fromSequence ("throw new org.refal.plus.RefalException(\"");
-  static  final Expr _c_227 = Expr.fromSequence ("} catch (java.lang.Exception e) {");
-  static  final Expr _c_228 = _c_111.subexpr (0, 1);
-  static  final Expr _c_229 = Expr.getConcatenator (3).toRight (Symbol.newWord ("Apply")).toRight (Symbol.newWord ("Apply")).toRight (Symbol.newWord ("Unexpected fail")).yield ();
-  static  final Expr _c_230 = Expr.fromSequence (".toRight (");
+  static  final Expr _c_179 = new Expr (Symbol.newWord ("byte"));
+  static  final Expr _c_180 = new Expr (Symbol.newWord ("short"));
+  static  final Expr _c_181 = new Expr (Symbol.newWord ("int"));
+  static  final Expr _c_182 = new Expr (Symbol.newWord ("long"));
+  static  final Expr _c_186 = Expr.fromSequence (".at(0)))");
+  static  final Expr _c_183 = _c_186.subexpr (0, 7);
+  static  final Expr _c_187 = Expr.fromSequence (") Native.objectValue(");
+  static  final Expr _c_184 = _c_187.subexpr (15, 6);
+  static  final Expr _c_185 = _c_187.subexpr (2, 7);
+  static  final Expr _c_188 = _c_110.subexpr (9, 2);
+  static  final Expr _c_189 = new Expr (Symbol.newWord ("EVAR"));
+  static  final Expr _c_190 = _c_18.subexpr (47, 2);
+  static  final Expr _c_195 = Expr.fromSequence (") Native.objectArrayValue(");
+  static  final Expr _c_191 = _c_195.subexpr (15, 11);
+  static  final Expr _c_192 = Expr.fromSequence (".length()]))");
+  static  final Expr _c_193 = _c_190.subexpr (0, 1);
+  static  final Expr _c_194 = Expr.fromSequence (", new ");
+  static  final Expr _c_196 = Expr.fromSequence ("Native.sValueOf(");
+  static  final Expr _c_197 = Expr.fromSequence ("Native.eValueOf(");
+  static  final Expr _c_198 = _c_158.subexpr (2, 3);
+  static  final Expr _c_199 = _c_158.subexpr (7, 3);
+  static  final Expr _c_200 = new Expr (Symbol.newWord (""));
+  static  final Expr _c_201 = _c_10.subexpr (2, 4);
+  static  final Expr _c_202 = Expr.fromSequence (".assign(");
+  static  final Expr _c_203 = Expr.fromSequence ("\", e.toString());");
+  static  final Expr _c_204 = Expr.fromSequence ("throw new org.refal.plus.RefalException(\"");
+  static  final Expr _c_205 = Expr.fromSequence ("} catch (java.lang.Exception e) {");
+  static  final Expr _c_206 = _c_160.subexpr (41, 25);
+  static  final Expr _c_207 = _c_18.subexpr (13, 6);
+  static  final Expr _c_208 = Expr.getConcatenator (3).toRight (Symbol.newWord ("Apply")).toRight (Symbol.newWord ("Apply")).toRight (Symbol.newWord ("Unexpected fail")).yield ();
+  static  final Expr _c_209 = Expr.fromSequence (".toRight (");
 
   @RefalFormat("$func RFP_ASAIL_To_Java t = (e) (e);")
@@ -336 +314 @@
         break _block2;
       }
-      refal.plus.Box.Store (Entry, new Expr ((Comparable) Expr.concat (_ve_moduleName, _c_4)));
+      refal.plus.Box.Store (Entry, new Expr ((Comparable<?>) Expr.concat (_ve_moduleName, _c_4)));
     }
     refal.plus.Box.Store (Entry_Name, Expr.empty);
@@ -349 +327 @@
         Result _v_ASAIL__To__Java1 = new Result (Expr.empty);
         ASAIL_To_Java (_ve_asail, _v_ASAIL__To__Java1);
-        int _v_len5 = _v_len__moduleName;
-        int _v_len6 = 1;
-        if (_v_len5 < _v_len6)
+        int _v_len5 = _v_ASAIL__To__Java1.getExpr ().length ();
+        int _v_len6 = 0;
+        if (_v_len5 < (_v_len6 + 1))
         {
           break _block3__branch1;
         }
-        int _v_len__package = (_v_len5 - _v_len6);
-        int _v_len7 = _v_ASAIL__To__Java1.getExpr ().length ();
-        int _v_len8 = 0;
-        if (_v_len7 < (_v_len8 + 1))
+        int _v_len__java__2 = (_v_len5 - _v_len6);
+        int _v_len7 = _v_len__moduleName;
+        int _v_len8 = 1;
+        if (_v_len7 < _v_len8)
         {
           break _block3__branch1;
         }
-        int _v_len__java__2 = (_v_len7 - _v_len8);
+        int _v_len__package = (_v_len7 - _v_len8);
         if (!_ve_moduleName.isSymbolAt ((0 + _v_len__package)))
         {
@@ -387 +365 @@
             Result _ge_auxcall4 = new Result (Expr.empty);
             refal.plus.List.Intersperse (_c_5, _ve_package, _ge_auxcall4);
-            _ge_package__3 = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_7).toRight (_ge_auxcall4.getExpr ()).toRight (_c_6).yield ());
+            _ge_package__3 = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_7).toRight (_ge_auxcall4.getExpr ()).toRight (_c_6).yield ());
             break _block4;
           }
@@ -421 +399 @@
             Expr _vs_name = Expr.empty;
             _vs_name = _v_deref__Get1.subexpr ((0 + _v_len___dollar_tmp_m_86_m_31), 1);
-            _ve_entry = Expr.concat (_c_19, (Comparable) Expr.getConcatenator ().toRight (_c_18).toRight ((Comparable) new Expr ((Comparable) Expr.concat (_c_17, (Comparable) Expr.getConcatenator ().toRight (_c_16).toRight ((Comparable) Expr.concat ((Comparable) Expr.concat (_c_13, (Comparable) Expr.getConcatenator ().toRight ((Comparable) Expr.getConcatenator ().toRight (_c_9).toRight (_vs_refal__mod__name.getExpr ()).toRight (_c_8).yield ()).toRight ((Comparable) Expr.concat (_c_11, (Comparable) Expr.concat (_vs_name, _c_10))).toRight (_c_12).yield ()), _c_14)).toRight (_c_15).yield ()))).toRight (_c_14).yield ());
+            _ve_entry = Expr.concat (_c_19, (Comparable<?>) Expr.getConcatenator ().toRight (_c_18).toRight ((Comparable<?>) new Expr ((Comparable<?>) Expr.concat (_c_17, (Comparable<?>) Expr.getConcatenator ().toRight (_c_16).toRight ((Comparable<?>) Expr.concat ((Comparable<?>) Expr.concat (_c_13, (Comparable<?>) Expr.getConcatenator ().toRight ((Comparable<?>) Expr.getConcatenator ().toRight (_c_9).toRight (_vs_refal__mod__name.getExpr ()).toRight (_c_8).yield ()).toRight ((Comparable<?>) Expr.concat (_c_11, (Comparable<?>) Expr.concat (_vs_name, _c_10))).toRight (_c_12).yield ()), _c_14)).toRight (_c_15).yield ()))).toRight (_c_14).yield ());
             break _block5;
           }
           _ve_entry = Expr.empty;
         }
-        _ve_java = Expr.getConcatenator ().toRight (_ge_package__3).toRight (_c_22).toRight ((Comparable) Expr.getConcatenator ().toRight (_c_21).toRight (_vs_class).toRight (_c_20).toRight ((Comparable) Expr.concat (_gv_java__2, _ve_entry)).toRight (_c_14).yield ()).yield ();
+        _ve_java = Expr.getConcatenator ().toRight (_ge_package__3).toRight (_c_22).toRight ((Comparable<?>) Expr.getConcatenator ().toRight (_c_21).toRight (_vs_class).toRight (_c_20).toRight ((Comparable<?>) Expr.concat (_gv_java__2, _ve_entry)).toRight (_c_14).yield ()).yield ();
         break _block3;
       }
@@ -610 +588 @@
             Expr _v_deref__deref__item2 = (Expr) _v_deref__item2.at ((0 + 1 + 1 + 1 + 1));
             Expr _v_deref__deref__item22 = (Expr) _v_deref__item2.at ((0 + 1 + 1 + 1 + 1 + 1));
-            int _v_len7 = _v_deref__deref__item22.length ();
+            int _v_len7 = _v_deref__deref__item2.length ();
             int _v_len8 = 0;
             if (_v_len7 < _v_len8)
@@ -616 +594 @@
               break _block2__branch2;
             }
-            int _v_len__out = (_v_len7 - _v_len8);
-            int _v_len9 = _v_deref__deref__item2.length ();
+            int _v_len__in = (_v_len7 - _v_len8);
+            int _v_len9 = _v_deref__deref__item22.length ();
             int _v_len10 = 0;
             if (_v_len9 < _v_len10)
@@ -623 +601 @@
               break _block2__branch2;
             }
-            int _v_len__in = (_v_len9 - _v_len10);
+            int _v_len__out = (_v_len9 - _v_len10);
             if (!_c_28.termEquals (_v_deref__item2, 0))
             {
@@ -676 +654 @@
             Expr _v_deref__deref__item3 = (Expr) _v_deref__item3.at ((0 + 1 + 1 + 1));
             Expr _v_deref__deref__item32 = (Expr) _v_deref__item3.at ((0 + 1 + 1 + 1 + 1));
-            int _v_len13 = _v_deref__deref__item32.length ();
+            int _v_len13 = _v_deref__deref__item3.length ();
             int _v_len14 = 0;
             if (_v_len13 < _v_len14)
@@ -682 +660 @@
               break _block2__branch3;
             }
-            int _v_len__ress = (_v_len13 - _v_len14);
-            int _v_len15 = _v_deref__deref__item3.length ();
+            int _v_len__args = (_v_len13 - _v_len14);
+            int _v_len15 = _v_deref__deref__item32.length ();
             int _v_len16 = 0;
             if (_v_len15 < _v_len16)
@@ -689 +667 @@
               break _block2__branch3;
             }
-            int _v_len__args = (_v_len15 - _v_len16);
+            int _v_len__ress = (_v_len15 - _v_len16);
             if (!_v_deref__item3.isSymbolAt (0))
             {
@@ -780 +758 @@
                 Result _gs_auxcall3 = new Result (Expr.empty);
                 ReplaceQuotes (_gs_auxcall2.getExpr (), _gs_auxcall3);
-                _ve_refalFormat = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_35).toRight (_gs_auxcall3.getExpr ()).toRight (_c_34).yield ());
+                _ve_refalFormat = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_35).toRight (_gs_auxcall3.getExpr ()).toRight (_c_34).yield ());
                 break _block5;
               }
@@ -793 +771 @@
             Result _ge_auxcall7 = new Result (Expr.empty);
             ASAIL_To_Java (_ve_body, _ge_auxcall7);
-            _ve_java__item = Expr.getConcatenator ().toRight (_c_19).toRight (_ve_refalFormat).toRight ((Comparable) Expr.getConcatenator ().toRight (_c_41).toRight (_ge_auxcall4.getExpr ()).toRight (_c_40).toRight (_ve_return__type).toRight (_c_40).toRight (_ge_auxcall5.getExpr ()).toRight (_c_39).toRight (_ge_auxcall6.getExpr ()).toRight (_c_38).yield ()).toRight ((Comparable) Expr.getConcatenator ().toRight (_c_42).toRight ((Comparable) Expr.concat (_ge_auxcall7.getExpr (), _ve_return)).toRight (_c_14).yield ()).yield ();
+            _ve_java__item = Expr.getConcatenator ().toRight (_c_19).toRight (_ve_refalFormat).toRight ((Comparable<?>) Expr.getConcatenator ().toRight (_c_41).toRight (_ge_auxcall4.getExpr ()).toRight (_c_40).toRight (_ve_return__type).toRight (_c_40).toRight (_ge_auxcall5.getExpr ()).toRight (_c_39).toRight (_ge_auxcall6.getExpr ()).toRight (_c_38).yield ()).toRight ((Comparable<?>) Expr.getConcatenator ().toRight (_c_42).toRight ((Comparable<?>) Expr.concat (_ge_auxcall7.getExpr (), _ve_return)).toRight (_c_14).yield ()).yield ();
             break _block2;
           }
@@ -839 +817 @@
             Expr _v_deref__deref__item5 = (Expr) _v_deref__item5.at ((0 + 1 + 1));
             Expr _v_deref__deref__item52 = (Expr) _v_deref__item5.at ((0 + 1 + 1 + 1));
-            int _v_len21 = _v_deref__deref__item52.length ();
+            int _v_len21 = _v_deref__deref__item5.length ();
             int _v_len22 = 0;
             if (_v_len21 < _v_len22)
@@ -845 +823 @@
               break _block2__branch5;
             }
-            int _v_len__arg2 = (_v_len21 - _v_len22);
-            int _v_len23 = _v_deref__deref__item5.length ();
+            int _v_len__arg1 = (_v_len21 - _v_len22);
+            int _v_len23 = _v_deref__deref__item52.length ();
             int _v_len24 = 0;
             if (_v_len23 < _v_len24)
@@ -852 +830 @@
               break _block2__branch5;
             }
-            int _v_len__arg1 = (_v_len23 - _v_len24);
+            int _v_len__arg2 = (_v_len23 - _v_len24);
             if (!_c_44.termEquals (_v_deref__item5, 0))
             {
@@ -876 +854 @@
             Result _ge_auxcall9 = new Result (Expr.empty);
             ASAIL_To_Java (_ve_body, _ge_auxcall9);
-            _ve_java__item = Expr.concat ((Comparable) Expr.getConcatenator ().toRight (_c_46).toRight (_ve_cond).toRight (_c_45).yield (), (Comparable) Expr.getConcatenator ().toRight (_c_42).toRight ((Comparable) _ge_auxcall9.getExpr ()).toRight (_c_14).yield ());
+            _ve_java__item = Expr.concat ((Comparable<?>) Expr.getConcatenator ().toRight (_c_46).toRight (_ve_cond).toRight (_c_45).yield (), (Comparable<?>) Expr.getConcatenator ().toRight (_c_42).toRight ((Comparable<?>) _ge_auxcall9.getExpr ()).toRight (_c_14).yield ());
             break _block2;
           }
@@ -943 +921 @@
             Result _ge_auxcall13 = new Result (Expr.empty);
             ASAIL_To_Java (_ve_body, _ge_auxcall13);
-            _ve_java__item = Expr.getConcatenator ().toRight (_ge_auxcall12.getExpr ()).toRight ((Comparable) Expr.getConcatenator ().toRight (_c_46).toRight (_ve_j__cond.getExpr ()).toRight (_c_45).yield ()).toRight ((Comparable) Expr.getConcatenator ().toRight (_c_42).toRight ((Comparable) Expr.concat (_ve_if__yes__assigns, _ge_auxcall13.getExpr ())).toRight (_c_14).yield ()).toRight (_ve_if__not__assigns).yield ();
+            _ve_java__item = Expr.getConcatenator ().toRight (_ge_auxcall12.getExpr ()).toRight ((Comparable<?>) Expr.getConcatenator ().toRight (_c_46).toRight (_ve_j__cond.getExpr ()).toRight (_c_45).yield ()).toRight ((Comparable<?>) Expr.getConcatenator ().toRight (_c_42).toRight ((Comparable<?>) Expr.concat (_ve_if__yes__assigns, _ge_auxcall13.getExpr ())).toRight (_c_14).yield ()).toRight (_ve_if__not__assigns).yield ();
             break _block2;
           }
@@ -981 +959 @@
             }
             int _v_len__cont__label = (_v_len31 - _v_len32);
-            int _v_len33 = _v_deref__deref__item73.length ();
+            int _v_len33 = _v_deref__deref__item72.length ();
             int _v_len34 = 0;
             if (_v_len33 < _v_len34)
@@ -987 +965 @@
               break _block2__branch7;
             }
-            int _v_len__step = (_v_len33 - _v_len34);
-            int _v_len35 = _v_deref__deref__item72.length ();
+            int _v_len__break__label = (_v_len33 - _v_len34);
+            int _v_len35 = _v_deref__deref__item73.length ();
             int _v_len36 = 0;
             if (_v_len35 < _v_len36)
@@ -994 +972 @@
               break _block2__branch7;
             }
-            int _v_len__break__label = (_v_len35 - _v_len36);
+            int _v_len__step = (_v_len35 - _v_len36);
             if (!_c_49.termEquals (_v_deref__item7, 0))
             {
@@ -1021 +999 @@
                 _vt__dollar_tmp_m_162_m_25 = _ve_cont__label.subexpr (0, 1);
                 Result _ge_auxcall14 = new Result (Expr.empty);
-                refal.plus.JavaMangle.Rfp2Java (new Expr ((Comparable) Expr.concat (_c_50, _ve_cont__label)), _ge_auxcall14);
+                refal.plus.JavaMangle.Rfp2Java (new Expr ((Comparable<?>) Expr.concat (_c_50, _ve_cont__label)), _ge_auxcall14);
                 _ve_cont = Expr.concat (_ge_auxcall14.getExpr (), _c_51);
                 break _block7;
@@ -1037 +1015 @@
                 _vt__dollar_tmp_m_165_m_26 = _ve_break__label.subexpr (0, 1);
                 Result _ge_auxcall15 = new Result (Expr.empty);
-                refal.plus.JavaMangle.Rfp2Java (new Expr ((Comparable) Expr.concat (_c_50, _ve_break__label)), _ge_auxcall15);
+                refal.plus.JavaMangle.Rfp2Java (new Expr ((Comparable<?>) Expr.concat (_c_50, _ve_break__label)), _ge_auxcall15);
                 _ve_break = Expr.concat (_ge_auxcall15.getExpr (), _c_51);
                 break _block8;
@@ -1105 +1083 @@
                 Result _ge_auxcall17 = new Result (Expr.empty);
                 refal.plus.JavaMangle.Rfp2Java (_vt_var2, _ge_auxcall17);
-                _ve_split__vars = Expr.concat ((Comparable) Expr.getConcatenator ().toRight (_c_56).toRight (_ge_auxcall16.getExpr ()).toRight (_c_55).toRight (_ve_new__var).toRight (_c_54).yield (), (Comparable) Expr.getConcatenator ().toRight (_c_56).toRight (_ge_auxcall17.getExpr ()).toRight (_c_55).toRight (_ve_new__var).toRight (_c_57).yield ());
+                _ve_split__vars = Expr.concat ((Comparable<?>) Expr.getConcatenator ().toRight (_c_56).toRight (_ge_auxcall16.getExpr ()).toRight (_c_55).toRight (_ve_new__var).toRight (_c_54).yield (), (Comparable<?>) Expr.getConcatenator ().toRight (_c_56).toRight (_ge_auxcall17.getExpr ()).toRight (_c_55).toRight (_ve_new__var).toRight (_c_57).yield ());
                 break _block9;
               }
@@ -1117 +1095 @@
             Result _ge_auxcall20 = new Result (Expr.empty);
             ASAIL_To_Java (_ve_body, _ge_auxcall20);
-            _ve_java__item = Expr.concat ((Comparable) Expr.getConcatenator ().toRight (_ve_break).toRight (_ve_cont).toRight (_c_58).toRight (_ge_auxcall18.getExpr ()).toRight (_c_45).yield (), (Comparable) Expr.getConcatenator ().toRight (_c_42).toRight ((Comparable) Expr.getConcatenator ().toRight (_ve_split__vars).toRight (_ge_auxcall19.getExpr ()).toRight (_ge_auxcall20.getExpr ()).yield ()).toRight (_c_14).yield ());
+            _ve_java__item = Expr.concat ((Comparable<?>) Expr.getConcatenator ().toRight (_ve_break).toRight (_ve_cont).toRight (_c_58).toRight (_ge_auxcall18.getExpr ()).toRight (_c_45).yield (), (Comparable<?>) Expr.getConcatenator ().toRight (_c_42).toRight ((Comparable<?>) Expr.getConcatenator ().toRight (_ve_split__vars).toRight (_ge_auxcall19.getExpr ()).toRight (_ge_auxcall20.getExpr ()).yield ()).toRight (_c_14).yield ());
             break _block2;
           }
@@ -1154 +1132 @@
             _ve_label = _v_deref__deref__item8.subexpr (0, _v_len__label);
             Result _ge_auxcall21 = new Result (Expr.empty);
-            refal.plus.JavaMangle.Rfp2Java (new Expr ((Comparable) Expr.concat (_c_50, _ve_label)), _ge_auxcall21);
+            refal.plus.JavaMangle.Rfp2Java (new Expr ((Comparable<?>) Expr.concat (_c_50, _ve_label)), _ge_auxcall21);
             Result _ge_auxcall22 = new Result (Expr.empty);
             ASAIL_To_Java (_ve_body, _ge_auxcall22);
-            _ve_java__item = new Expr ((Comparable) Expr.getConcatenator ().toRight (_ge_auxcall21.getExpr ()).toRight (_c_59).toRight ((Comparable) _ge_auxcall22.getExpr ()).toRight (_c_14).yield ());
+            _ve_java__item = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_ge_auxcall21.getExpr ()).toRight (_c_59).toRight ((Comparable<?>) _ge_auxcall22.getExpr ()).toRight (_c_14).yield ());
             break _block2;
           }
@@ -1185 +1163 @@
             Result _ge_auxcall25 = new Result (Expr.empty);
             ASAIL_To_Java (_ve_body, _ge_auxcall25);
-            _ve_java__item = Expr.concat (_c_65, (Comparable) Expr.getConcatenator ().toRight (_c_42).toRight ((Comparable) Expr.concat ((Comparable) Expr.concat (_c_64, (Comparable) Expr.getConcatenator ().toRight (_c_63).toRight (_ge_auxcall23.getExpr ()).toRight (_c_62).toRight (_ge_auxcall24.getExpr ()).toRight (_c_61).yield ()), _ge_auxcall25.getExpr ())).toRight (_c_14).yield ());
+            _ve_java__item = Expr.concat (_c_65, (Comparable<?>) Expr.getConcatenator ().toRight (_c_42).toRight ((Comparable<?>) Expr.concat ((Comparable<?>) Expr.concat (_c_64, (Comparable<?>) Expr.getConcatenator ().toRight (_c_63).toRight (_ge_auxcall23.getExpr ()).toRight (_c_62).toRight (_ge_auxcall24.getExpr ()).toRight (_c_61).yield ()), _ge_auxcall25.getExpr ())).toRight (_c_14).yield ());
             break _block2;
           }
@@ -1209 +1187 @@
             Result _ge_auxcall26 = new Result (Expr.empty);
             ASAIL_To_Java (_ve_body, _ge_auxcall26);
-            _ve_java__item = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_68).toRight ((Comparable) Expr.concat (_c_67, (Comparable) _ge_auxcall26.getExpr ())).toRight (_c_14).yield ());
+            _ve_java__item = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_68).toRight ((Comparable<?>) Expr.concat (_c_67, (Comparable<?>) _ge_auxcall26.getExpr ())).toRight (_c_14).yield ());
             break _block2;
           }
@@ -1229 +1207 @@
             Result _ge_auxcall28 = new Result (Expr.empty);
             refal.plus.Box.Get (Func_Name, _ge_auxcall28);
-            _ve_java__item = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_63).toRight (_ge_auxcall27.getExpr ()).toRight (_c_62).toRight (_ge_auxcall28.getExpr ()).toRight (_c_72).yield ());
+            _ve_java__item = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_63).toRight (_ge_auxcall27.getExpr ()).toRight (_c_62).toRight (_ge_auxcall28.getExpr ()).toRight (_c_72).yield ());
             break _block2;
           }
@@ -1275 +1253 @@
             Expr_Int_To_Java (_ve_min, _va_5);
             _ve_min = _va_5.getExpr ();
-            _ve_java__item = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_77).toRight (_ve_new__var).toRight (_c_55).toRight (_ve_n.getExpr ()).toRight (_c_76).toRight (_ve_min).toRight (_c_75).yield ());
+            _ve_java__item = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_77).toRight (_ve_new__var).toRight (_c_55).toRight (_ve_n.getExpr ()).toRight (_c_76).toRight (_ve_min).toRight (_c_75).yield ());
             break _block2;
           }
@@ -1321 +1299 @@
             Expr_Int_To_Java (_ve_min, _va_6);
             _ve_min = _va_6.getExpr ();
-            _ve_java__item = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_77).toRight (_ve_new__var).toRight (_c_55).toRight (_ve_n.getExpr ()).toRight (_c_79).toRight (_ve_min).toRight (_c_75).yield ());
+            _ve_java__item = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_77).toRight (_ve_new__var).toRight (_c_55).toRight (_ve_n.getExpr ()).toRight (_c_79).toRight (_ve_min).toRight (_c_75).yield ());
             break _block2;
           }
@@ -1362 +1340 @@
             Result _ge_auxcall30 = new Result (Expr.empty);
             Expr_Int_To_Java (_ve_expr, _ge_auxcall30);
-            _ve_java__item = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_81).toRight (_ge_auxcall29.getExpr ()).toRight (_c_55).toRight (_ge_auxcall30.getExpr ()).toRight (_c_6).yield ());
+            _ve_java__item = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_81).toRight (_ge_auxcall29.getExpr ()).toRight (_c_55).toRight (_ge_auxcall30.getExpr ()).toRight (_c_6).yield ());
             break _block2;
           }
@@ -1403 +1381 @@
             Result _ge_auxcall32 = new Result (Expr.empty);
             Expr_Int_To_Java (_ve_expr, _ge_auxcall32);
-            _ve_java__item = new Expr ((Comparable) Expr.getConcatenator ().toRight (_ge_auxcall31.getExpr ()).toRight (_c_55).toRight (_ge_auxcall32.getExpr ()).toRight (_c_6).yield ());
+            _ve_java__item = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_ge_auxcall31.getExpr ()).toRight (_c_55).toRight (_ge_auxcall32.getExpr ()).toRight (_c_6).yield ());
             break _block2;
           }
@@ -1444 +1422 @@
                 }
                 refal.plus.Table.Bind (Result, _vt_var, _ve_j__var.getExpr ());
-                _ve_java__item = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_84).toRight (_ve_j__var.getExpr ()).toRight (_c_83).toRight (_ve_j__expr.getExpr ()).toRight (_c_75).yield ());
+                _ve_java__item = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_84).toRight (_ve_j__var.getExpr ()).toRight (_c_83).toRight (_ve_j__expr.getExpr ()).toRight (_c_75).yield ());
                 break _block11;
               }
               refal.plus.Table.Unbind (Result, _vt_var);
-              _ve_java__item = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_56).toRight (_ve_j__var.getExpr ()).toRight (_c_55).toRight (_ve_j__expr.getExpr ()).toRight (_c_6).yield ());
+              _ve_java__item = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_56).toRight (_ve_j__var.getExpr ()).toRight (_c_55).toRight (_ve_j__expr.getExpr ()).toRight (_c_6).yield ());
             }
             break _block2;
@@ -1507 +1485 @@
                   Result _ge_auxcall33 = new Result (Expr.empty);
                   refal.plus.JavaMangle.Rfp2Java (_vt_var, _ge_auxcall33);
-                  _ve_java__item = new Expr ((Comparable) Expr.getConcatenator ().toRight (_ge_auxcall33.getExpr ()).toRight (_c_85).toRight (_ve_j__expr.getExpr ()).toRight (_c_75).yield ());
+                  _ve_java__item = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_ge_auxcall33.getExpr ()).toRight (_c_85).toRight (_ve_j__expr.getExpr ()).toRight (_c_75).yield ());
                   break _exit2;
                 }
@@ -1518 +1496 @@
                   break _block12__branch2;
                 }
-                _ve_java__item = new Expr ((Comparable) Expr.getConcatenator ().toRight (_ge_auxcall34.getExpr ()).toRight (_c_85).toRight (_ve_j__expr.getExpr ()).toRight (_c_75).yield ());
+                _ve_java__item = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_ge_auxcall34.getExpr ()).toRight (_c_85).toRight (_ve_j__expr.getExpr ()).toRight (_c_75).yield ());
                 break _block12;
               }
               Result _ge_auxcall35 = new Result (Expr.empty);
               refal.plus.JavaMangle.Rfp2Java (_vt_var, _ge_auxcall35);
-              _ve_java__item = new Expr ((Comparable) Expr.getConcatenator ().toRight (_ge_auxcall35.getExpr ()).toRight (_c_55).toRight (_ve_j__expr.getExpr ()).toRight (_c_6).yield ());
+              _ve_java__item = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_ge_auxcall35.getExpr ()).toRight (_c_55).toRight (_ve_j__expr.getExpr ()).toRight (_c_6).yield ());
             }
             break _block2;
@@ -1545 +1523 @@
             Result _ge_auxcall36 = new Result (Expr.empty);
             Var_To_Java (_vt_var, _ge_auxcall36);
-            _ve_java__item = new Expr ((Comparable) Expr.concat (_ge_auxcall36.getExpr (), _c_87));
+            _ve_java__item = new Expr ((Comparable<?>) Expr.concat (_ge_auxcall36.getExpr (), _c_87));
             break _block2;
           }
@@ -1565 +1543 @@
             _vt_label = _v_deref__item18.subexpr ((0 + 1), 1);
             Result _ge_auxcall37 = new Result (Expr.empty);
-            refal.plus.JavaMangle.Rfp2Java (new Expr ((Comparable) Expr.concat (_c_50, _vt_label)), _ge_auxcall37);
-            _ve_java__item = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_89).toRight (_ge_auxcall37.getExpr ()).toRight (_c_6).yield ());
+            refal.plus.JavaMangle.Rfp2Java (new Expr ((Comparable<?>) Expr.concat (_c_50, _vt_label)), _ge_auxcall37);
+            _ve_java__item = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_89).toRight (_ge_auxcall37.getExpr ()).toRight (_c_6).yield ());
             break _block2;
           }
@@ -1586 +1564 @@
             _vt_label = _v_deref__item19.subexpr ((0 + 1), 1);
             Result _ge_auxcall38 = new Result (Expr.empty);
-            refal.plus.JavaMangle.Rfp2Java (new Expr ((Comparable) Expr.concat (_c_50, _vt_label)), _ge_auxcall38);
-            _ve_java__item = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_91).toRight (_ge_auxcall38.getExpr ()).toRight (_c_6).yield ());
+            refal.plus.JavaMangle.Rfp2Java (new Expr ((Comparable<?>) Expr.concat (_c_50, _vt_label)), _ge_auxcall38);
+            _ve_java__item = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_91).toRight (_ge_auxcall38.getExpr ()).toRight (_c_6).yield ());
             break _block2;
           }
@@ -1611 +1589 @@
             Result _ge_auxcall39 = new Result (Expr.empty);
             Expr_Ref_To_Java (_ve_expr, _ge_auxcall39);
-            _ve_java__item = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_93).toRight (_ge_auxcall39.getExpr ()).toRight (_c_75).yield ());
+            _ve_java__item = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_93).toRight (_ge_auxcall39.getExpr ()).toRight (_c_75).yield ());
             break _block2;
           }
@@ -1697 +1675 @@
                 Result _gs_auxcall41 = new Result (Expr.empty);
                 ReplaceQuotes (_gs_auxcall40.getExpr (), _gs_auxcall41);
-                _ve_refalDecl = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_35).toRight (_gs_auxcall41.getExpr ()).toRight (_c_34).yield ());
+                _ve_refalDecl = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_35).toRight (_gs_auxcall41.getExpr ()).toRight (_c_34).yield ());
                 break _block14;
               }
@@ -1704 +1682 @@
             Result _ge_auxcall42 = new Result (Expr.empty);
             Access_Mode (_vs_linkage, _ge_auxcall42);
-            _ve_java__item = Expr.concat (_ve_refalDecl, (Comparable) Expr.getConcatenator ().toRight (_c_41).toRight (_ge_auxcall42.getExpr ()).toRight (_c_96).toRight (_ve_n).toRight (_c_55).toRight (_ve_j__expr.getExpr ()).toRight (_c_6).yield ());
+            _ve_java__item = Expr.concat (_ve_refalDecl, (Comparable<?>) Expr.getConcatenator ().toRight (_c_41).toRight (_ge_auxcall42.getExpr ()).toRight (_c_96).toRight (_ve_n).toRight (_c_55).toRight (_ve_j__expr.getExpr ()).toRight (_c_6).yield ());
             break _block2;
           }
@@ -1785 +1763 @@
                 Result _gs_auxcall44 = new Result (Expr.empty);
                 ReplaceQuotes (_gs_auxcall43.getExpr (), _gs_auxcall44);
-                _ve_refalDecl = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_35).toRight (_gs_auxcall44.getExpr ()).toRight (_c_34).yield ());
+                _ve_refalDecl = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_35).toRight (_gs_auxcall44.getExpr ()).toRight (_c_34).yield ());
                 break _block15;
               }
@@ -1794 +1772 @@
             Result _ge_auxcall46 = new Result (Expr.empty);
             Name_To_Java (_vt_name, _ge_auxcall46);
-            _ve_java__item = Expr.concat (_ve_refalDecl, (Comparable) Expr.getConcatenator ().toRight (_c_41).toRight (_ge_auxcall45.getExpr ()).toRight (_c_96).toRight (_ge_auxcall46.getExpr ()).toRight (_c_100).toRight (_ve_class__name).toRight (_c_99).toRight (_vs_n).toRight (_c_98).yield ());
+            _ve_java__item = Expr.concat (_ve_refalDecl, (Comparable<?>) Expr.getConcatenator ().toRight (_c_41).toRight (_ge_auxcall45.getExpr ()).toRight (_c_96).toRight (_ge_auxcall46.getExpr ()).toRight (_c_100).toRight (_ve_class__name).toRight (_c_99).toRight (_vs_n).toRight (_c_98).yield ());
             break _block2;
           }
@@ -1854 +1832 @@
           Expr _v_deref__deref__item25 = (Expr) _v_deref__item25.at ((0 + 1 + 1));
           Expr _v_deref__deref__item252 = (Expr) _v_deref__item25.at ((0 + 1 + 1 + 1));
-          int _v_len75 = _v_deref__deref__item252.length ();
+          int _v_len75 = _v_deref__deref__item25.length ();
           int _v_len76 = 0;
           if (_v_len75 < _v_len76)
@@ -1860 +1838 @@
             throw new RefalException ("org.refal.plus.compiler.rfp_asail_java", "ASAIL_To_Java", "Unexpected fail");
           }
-          int _v_len__ress2 = (_v_len75 - _v_len76);
-          int _v_len77 = _v_deref__deref__item25.length ();
+          int _v_len__args2 = (_v_len75 - _v_len76);
+          int _v_len77 = _v_deref__deref__item252.length ();
           int _v_len78 = 0;
           if (_v_len77 < _v_len78)
@@ -1867 +1845 @@
             throw new RefalException ("org.refal.plus.compiler.rfp_asail_java", "ASAIL_To_Java", "Unexpected fail");
           }
-          int _v_len__args2 = (_v_len77 - _v_len78);
+          int _v_len__ress2 = (_v_len77 - _v_len78);
           if (!_v_deref__item25.isSymbolAt (0))
           {
@@ -1896 +1874 @@
                 break _block16__branch1;
               }
-              _ve_java__item = Expr.concat (_ve_decls.getExpr (), (Comparable) Expr.getConcatenator ().toRight (_c_105).toRight (_ve_c).toRight (_c_104).yield ());
+              _ve_java__item = Expr.concat (_ve_decls.getExpr (), (Comparable<?>) Expr.getConcatenator ().toRight (_c_105).toRight (_ve_c).toRight (_c_104).yield ());
               break _block16;
             }
@@ -1902 +1880 @@
             refal.plus.Box.Get (Res_Assigns, _ge_auxcall48);
             refal.plus.Box.Store (Res_Assigns, Expr.empty);
-            _ve_java__item = Expr.getConcatenator ().toRight (_ve_decls.getExpr ()).toRight ((Comparable) Expr.concat (_ve_c, _c_6)).toRight (_ge_auxcall48.getExpr ()).yield ();
+            _ve_java__item = Expr.getConcatenator ().toRight (_ve_decls.getExpr ()).toRight ((Comparable<?>) Expr.concat (_ve_c, _c_6)).toRight (_ge_auxcall48.getExpr ()).yield ();
           }
         }
@@ -1954 +1932 @@
         }
         int _v_len__ress = (_v_len1 - _v_len2);
-        Expr _v_compose1 = Expr.concat ((Comparable) _ge_arg1, _ge_arg2);
+        Expr _v_compose1 = Expr.concat ((Comparable<?>) _ge_arg1, _ge_arg2);
         if (_v_compose1.isSymbolAt (0))
         {
@@ -1981 +1959 @@
             Result _ge_auxcall1 = new Result (Expr.empty);
             refal.plus.JavaMangle.Rfp2Java (_vt_var, _ge_auxcall1);
-            Declare_Results (_ve_r, Expr.concat (_ve_ress, (Comparable) _ge_auxcall1.getExpr ()), _v_res1, _v_res2);
+            Declare_Results (_ve_r, Expr.concat (_ve_ress, (Comparable<?>) _ge_auxcall1.getExpr ()), _v_res1, _v_res2);
             break _block2;
           }
@@ -2015 +1993 @@
               Result _ge_auxcall2 = new Result (Expr.empty);
               refal.plus.JavaMangle.Rfp2Java (_vt_var, _ge_auxcall2);
-              Declare_Results (_ve_r, Expr.concat (_ve_ress, (Comparable) _ge_auxcall2.getExpr ()), _v_res1, _v_res2);
+              Declare_Results (_ve_r, Expr.concat (_ve_ress, (Comparable<?>) _ge_auxcall2.getExpr ()), _v_res1, _v_res2);
               break _exit1;
             }
@@ -2025 +2003 @@
           Result _ge_auxcall3 = new Result (Expr.empty);
           refal.plus.JavaMangle.Rfp2Java (_vt_var, _ge_auxcall3);
-          refal.plus.Box.Put (Res_Assigns, new Expr ((Comparable) Expr.getConcatenator ().toRight (_ge_auxcall3.getExpr ()).toRight (_c_55).toRight (_ve_new__var).toRight (_c_106).yield ()));
+          refal.plus.Box.Put (Res_Assigns, new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_ge_auxcall3.getExpr ()).toRight (_c_55).toRight (_ve_new__var).toRight (_c_106).yield ()));
           Result _v_Declare__Results1 = new Result (Expr.empty);
-          Declare_Results (_ve_r, Expr.concat (_ve_ress, (Comparable) _ve_new__var), _v_Declare__Results1, _v_res2);
-          _v_res1.assign (Expr.concat ((Comparable) Expr.getConcatenator ().toRight (_c_84).toRight (_ve_new__var).toRight (_c_107).yield (), _v_Declare__Results1.getExpr ()));
+          Declare_Results (_ve_r, Expr.concat (_ve_ress, (Comparable<?>) _ve_new__var), _v_Declare__Results1, _v_res2);
+          _v_res1.assign (Expr.concat ((Comparable<?>) Expr.getConcatenator ().toRight (_c_84).toRight (_ve_new__var).toRight (_c_107).yield (), _v_Declare__Results1.getExpr ()));
         }
         break _block1;
@@ -2039 +2017 @@
       }
       int _v_len__ress2 = (_v_len7 - _v_len8);
-      Expr _v_compose2 = Expr.concat ((Comparable) _ge_arg1, _ge_arg2);
+      Expr _v_compose2 = Expr.concat ((Comparable<?>) _ge_arg1, _ge_arg2);
       if (!_c_19.termEquals (_v_compose2, 0))
       {
@@ -2230 +2208 @@
         Expr _v_deref__deref__erm3 = (Expr) _v_deref__erm3.at ((0 + 1 + _v_len__expr3));
         Expr _v_deref__deref__erm32 = (Expr) _v_deref__erm3.at ((0 + 1 + _v_len__expr3 + 1));
-        int _v_len9 = _v_deref__deref__erm32.length ();
+        int _v_len9 = _v_deref__deref__erm3.length ();
         int _v_len10 = 0;
         if (_v_len9 < _v_len10)
@@ -2236 +2214 @@
           break _block1__branch3;
         }
-        int _v_len__len = (_v_len9 - _v_len10);
-        int _v_len11 = _v_deref__deref__erm3.length ();
+        int _v_len__pos2 = (_v_len9 - _v_len10);
+        int _v_len11 = _v_deref__deref__erm32.length ();
         int _v_len12 = 0;
         if (_v_len11 < _v_len12)
@@ -2243 +2221 @@
           break _block1__branch3;
         }
-        int _v_len__pos2 = (_v_len11 - _v_len12);
+        int _v_len__len = (_v_len11 - _v_len12);
         if (!_c_121.termEquals (_v_deref__erm3, 0))
         {
@@ -2344 +2322 @@
             break _block2;
           }
-          throw new RefalException (new Expr ((Comparable) Expr.concat (_c_126, _vs_ObjectSymbol)));
+          throw new RefalException (new Expr ((Comparable<?>) Expr.concat (_c_126, _vs_ObjectSymbol)));
         }
         break _block1;
@@ -2530 +2508 @@
         Expr _v_deref__deref__deref__cond = (Expr) _v_deref__deref__cond.at ((0 + 1 + 1));
         Expr _v_deref__deref__deref__cond2 = (Expr) _v_deref__deref__cond.at ((0 + 1 + 1 + 1));
-        int _v_len1 = _v_deref__deref__deref__cond2.length ();
+        int _v_len1 = _v_deref__deref__deref__cond.length ();
         int _v_len2 = 0;
         if (_v_len1 < _v_len2)
@@ -2536 +2514 @@
           break _block1__branch1;
         }
-        int _v_len__ress = (_v_len1 - _v_len2);
-        int _v_len3 = _v_deref__deref__deref__cond.length ();
+        int _v_len__exprs = (_v_len1 - _v_len2);
+        int _v_len3 = _v_deref__deref__deref__cond2.length ();
         int _v_len4 = 0;
         if (_v_len3 < _v_len4)
@@ -2543 +2521 @@
           break _block1__branch1;
         }
-        int _v_len__exprs = (_v_len3 - _v_len4);
+        int _v_len__ress = (_v_len3 - _v_len4);
         if (!_c_48.termEquals (_v_deref__cond, 0))
         {
@@ -2665 +2643 @@
         Expr _v_deref__deref__cond4 = (Expr) _v_deref__cond4.at ((0 + 1 + _v_len__expr1));
         Expr _v_deref__deref__cond42 = (Expr) _v_deref__cond4.at ((0 + 1 + _v_len__expr1 + 1));
-        int _v_len13 = _v_deref__deref__cond42.length ();
+        int _v_len13 = _v_deref__deref__cond4.length ();
         int _v_len14 = 0;
         if (_v_len13 < _v_len14)
@@ -2671 +2649 @@
           break _block1__branch4;
         }
-        int _v_len__pos2 = (_v_len13 - _v_len14);
-        int _v_len15 = _v_deref__deref__cond4.length ();
+        int _v_len__expr22 = (_v_len13 - _v_len14);
+        int _v_len15 = _v_deref__deref__cond42.length ();
         int _v_len16 = 0;
         if (_v_len15 < _v_len16)
@@ -2678 +2656 @@
           break _block1__branch4;
         }
-        int _v_len__expr22 = (_v_len15 - _v_len16);
+        int _v_len__pos2 = (_v_len15 - _v_len16);
         if (!_c_145.termEquals (_v_deref__cond4, 0))
         {
@@ -2721 +2699 @@
         Expr _v_deref__deref__cond5 = (Expr) _v_deref__cond5.at ((0 + 1 + _v_len__expr12));
         Expr _v_deref__deref__cond52 = (Expr) _v_deref__cond5.at ((0 + 1 + _v_len__expr12 + 1));
-        int _v_len19 = _v_deref__deref__cond52.length ();
+        int _v_len19 = _v_deref__deref__cond5.length ();
         int _v_len20 = 0;
         if (_v_len19 < _v_len20)
@@ -2727 +2705 @@
           break _block1__branch5;
         }
-        int _v_len__pos3 = (_v_len19 - _v_len20);
-        int _v_len21 = _v_deref__deref__cond5.length ();
+        int _v_len__expr23 = (_v_len19 - _v_len20);
+        int _v_len21 = _v_deref__deref__cond52.length ();
         int _v_len22 = 0;
         if (_v_len21 < _v_len22)
@@ -2734 +2712 @@
           break _block1__branch5;
         }
-        int _v_len__expr23 = (_v_len21 - _v_len22);
+        int _v_len__pos3 = (_v_len21 - _v_len22);
         if (!_c_147.termEquals (_v_deref__cond5, 0))
         {
@@ -2814 +2792 @@
         _block2: {
           _block2__branch1: {
-            int _v_len5 = _ve_rest.length ();
+            int _v_len5 = _ve_arg.length ();
             int _v_len6 = 0;
             if (_v_len5 < (_v_len6 + 1))
@@ -2820 +2798 @@
               break _block2__branch1;
             }
-            int _v_len___dollar_tmp_m_371_m_28 = (_v_len5 - _v_len6);
-            int _v_len7 = _ve_arg.length ();
+            int _v_len___dollar_tmp_m_371_m_16 = (_v_len5 - _v_len6);
+            int _v_len7 = _ve_rest.length ();
             int _v_len8 = 0;
             if (_v_len7 < (_v_len8 + 1))
@@ -2827 +2805 @@
               break _block2__branch1;
             }
-            int _v_len___dollar_tmp_m_371_m_16 = (_v_len7 - _v_len8);
+            int _v_len___dollar_tmp_m_371_m_28 = (_v_len7 - _v_len8);
             Expr _vv__dollar_tmp_m_371_m_16 = Expr.empty;
             _vv__dollar_tmp_m_371_m_16 = _ve_arg.subexpr (0, _v_len___dollar_tmp_m_371_m_16);
@@ -3003 +2981 @@
                 _block4__branch1: {
                   int _v_len3 = _v_len__1;
-                  int _v_len4 = 12;
+                  int _v_len4 = 15;
                   if (_v_len3 < _v_len4)
                   {
                     break _block4__branch1;
                   }
-                  int _v_len___dollar_tmp_m_394_m_27 = (_v_len3 - _v_len4);
+                  int _v_len___dollar_tmp_m_394_m_30 = (_v_len3 - _v_len4);
                   if (!_c_152.equals (_ve_1, 0))
                   {
                     break _block4__branch1;
                   }
-                  Expr _ve__dollar_tmp_m_394_m_27 = Expr.empty;
-                  _ve__dollar_tmp_m_394_m_27 = _ve_1.subexpr ((0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1), _v_len___dollar_tmp_m_394_m_27);
+                  Expr _ve__dollar_tmp_m_394_m_30 = Expr.empty;
+                  _ve__dollar_tmp_m_394_m_30 = _ve_1.subexpr ((0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1), _v_len___dollar_tmp_m_394_m_30);
                   break _block4;
                 }
@@ -3069 +3047 @@
           Expr _v_deref__Const__Expr__Aux12 = (Expr) _v_Const__Expr__Aux1.getExpr ().at (0);
           Expr _v_deref__Const__Expr__Aux13 = (Expr) _v_Const__Expr__Aux1.getExpr ().at ((0 + 1));
-          int _v_len9 = _v_deref__Const__Expr__Aux13.length ();
+          int _v_len9 = _v_deref__Const__Expr__Aux12.length ();
           int _v_len10 = 0;
           if (_v_len9 < _v_len10)
@@ -3075 +3053 @@
             break _block2__branch2;
           }
-          int _v_len__2 = (_v_len9 - _v_len10);
-          int _v_len11 = _v_deref__Const__Expr__Aux12.length ();
+          int _v_len__12 = (_v_len9 - _v_len10);
+          int _v_len11 = _v_deref__Const__Expr__Aux13.length ();
           int _v_len12 = 0;
           if (_v_len11 < _v_len12)
@@ -3082 +3060 @@
             break _block2__branch2;
           }
-          int _v_len__12 = (_v_len11 - _v_len12);
+          int _v_len__2 = (_v_len11 - _v_len12);
           Expr _ve_1 = Expr.empty;
           _ve_1 = _v_deref__Const__Expr__Aux12.subexpr (0, _v_len__12);
@@ -3152 +3130 @@
         Result _ve_j__expr = new Result (Expr.empty);
         Const_Expr_Aux (Expr.empty, _ve_expr, _ve_j__expr);
-        _v_res1.assign (Expr.concat ((Comparable) Expr.getConcatenator ().toRight (_c_157).toRight (_ve_accum).toRight (_c_34).yield (), _ve_j__expr.getExpr ()));
+        _v_res1.assign (Expr.concat ((Comparable<?>) Expr.getConcatenator ().toRight (_c_157).toRight (_ve_accum).toRight (_c_34).yield (), _ve_j__expr.getExpr ()));
         break _block1;
       }
@@ -3190 +3168 @@
             Result _ge_auxcall2 = new Result (Expr.empty);
             Const_Expr_To_Java (_ve_paren__expr, _ge_auxcall2);
-            _ve_java__item = new Expr ((Comparable) Expr.concat (_c_117, _ge_auxcall2.getExpr ()));
+            _ve_java__item = new Expr ((Comparable<?>) Expr.concat (_c_117, _ge_auxcall2.getExpr ()));
             break _block2;
           }
@@ -3211 +3189 @@
             Result _ge_auxcall3 = new Result (Expr.empty);
             Name_To_Java (_vt_name, _ge_auxcall3);
-            _ve_java__item = new Expr ((Comparable) _ge_auxcall3.getExpr ());
+            _ve_java__item = new Expr ((Comparable<?>) _ge_auxcall3.getExpr ());
             break _block2;
           }
@@ -3235 +3213 @@
             Result _ge_auxcall4 = new Result (Expr.empty);
             refal.plus.JavaMangle.Rfp2Java (_vt_item, _ge_auxcall4);
-            _ve_java__item = new Expr ((Comparable) _ge_auxcall4.getExpr ());
+            _ve_java__item = new Expr ((Comparable<?>) _ge_auxcall4.getExpr ());
             break _block2;
           }
@@ -3256 +3234 @@
             Result _ge_auxcall5 = new Result (Expr.empty);
             Name_To_Java (_vt_name, _ge_auxcall5);
-            _ve_java__item = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_161).toRight ((Comparable) Expr.getConcatenator ().toRight (_c_160).toRight ((Comparable) Expr.getConcatenator ().toRight (_c_159).toRight (_ge_auxcall5.getExpr ()).toRight (_c_158).yield ()).toRight (_c_14).yield ()).toRight (_c_14).yield ());
+            _ve_java__item = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_161).toRight ((Comparable<?>) Expr.getConcatenator ().toRight (_c_160).toRight ((Comparable<?>) Expr.getConcatenator ().toRight (_c_159).toRight (_ge_auxcall5.getExpr ()).toRight (_c_158).yield ()).toRight (_c_14).yield ()).toRight (_c_14).yield ());
             break _block2;
           }
@@ -3277 +3255 @@
             Result _ge_auxcall6 = new Result (Expr.empty);
             Name_To_Java (_vt_name, _ge_auxcall6);
-            _ve_java__item = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_161).toRight ((Comparable) Expr.getConcatenator ().toRight (_c_160).toRight ((Comparable) Expr.concat ((Comparable) Expr.concat (_ge_auxcall6.getExpr (), _c_158), _c_33)).toRight (_c_14).yield ()).toRight (_c_14).yield ());
+            _ve_java__item = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_161).toRight ((Comparable<?>) Expr.getConcatenator ().toRight (_c_160).toRight ((Comparable<?>) Expr.concat ((Comparable<?>) Expr.concat (_ge_auxcall6.getExpr (), _c_158), _c_33)).toRight (_c_14).yield ()).toRight (_c_14).yield ());
             break _block2;
           }
@@ -3292 +3270 @@
                 break _block3__branch1;
               }
-              _ve_java__item = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_162).toRight (_vs_sym).toRight (_c_34).yield ());
+              _ve_java__item = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_162).toRight (_vs_sym).toRight (_c_34).yield ());
               break _block3;
             }
@@ -3301 +3279 @@
             Result _ge_auxcall7 = new Result (Expr.empty);
             Symbol_To_Java (_vs_sym, _ge_auxcall7);
-            _ve_java__item = new Expr ((Comparable) Expr.getConcatenator ().toRight (_c_163).toRight (_ge_auxcall7.getExpr ()).toRight (_c_34).yield ());
+            _ve_java__item = new Expr ((Comparable<?>) Expr.getConcatenator ().toRight (_c_163).toRight (_ge_auxcall7.getExpr ()).toRight (_c_34).yield ());
           }
         }
@@ -3800 +3778 @@
   }
 
-  @RefalFormat("$func ConvertTo2 s e = e;")
-  static  void ConvertTo2 (Expr _vs_javaType, Expr _ve_varName, Result _v_res1) throws RefalException
+  @RefalFormat("$func ConvertTo t t = e;")
+  static  void ConvertTo (Expr _gt_arg1, Expr _gt_arg2, Result _v_res1) throws RefalException
   {
-    _block1: {
-      _block1__branch1: {
-        _block2: {
-          _block2__branch1: {
-            if (!_vs_javaType.termEquals (_c_176, 0))
-            {
-              break _block2__branch1;
-            }
-            _v_res1.assign (Expr.getConcatenator ().toRight (_c_177).toRight (_ve_varName).toRight (_c_45).yield ());
-            break _block2;
-          }
-          _block2__branch2: {
-            if (!_vs_javaType.termEquals (_c_178, 0))
-            {
-              break _block2__branch2;
-            }
-            _v_res1.assign (Expr.getConcatenator ().toRight (_c_180).toRight (_ve_varName).toRight (_c_179).yield ());
-            break _block2;
-          }
-          _block2__branch3: {
-            if (!_vs_javaType.termEquals (_c_181, 0))
-            {
-              break _block2__branch3;
-            }
-            _v_res1.assign (Expr.getConcatenator ().toRight (_c_183).toRight (_ve_varName).toRight (_c_182).yield ());
-            break _block2;
-          }
-          _block2__branch4: {
-            if (!_vs_javaType.termEquals (_c_184, 0))
-            {
-              break _block2__branch4;
-            }
-            _v_res1.assign (Expr.getConcatenator ().toRight (_c_183).toRight (_ve_varName).toRight (_c_185).yield ());
-            break _block2;
-          }
-          _block2__branch5: {
-            if (!_vs_javaType.termEquals (_c_186, 0))
-            {
-              break _block2__branch5;
-            }
-            _v_res1.assign (Expr.getConcatenator ().toRight (_c_183).toRight (_ve_varName).toRight (_c_187).yield ());
-            break _block2;
-          }
-          if (!_vs_javaType.termEquals (_c_188, 0))
-          {
-            break _block1__branch1;
-          }
-          _v_res1.assign (Expr.getConcatenator ().toRight (_c_183).toRight (_ve_varName).toRight (_c_189).yield ());
-        }
-        break _block1;
-      }
-      _v_res1.assign (Expr.getConcatenator ().toRight (_c_135).toRight (_vs_javaType).toRight (_c_192).toRight (_ve_varName).toRight (_c_191).toRight (_ve_varName).toRight (_c_190).toRight (_ve_varName).toRight (_c_45).yield ());
-    }
-  }
-
-  @RefalFormat("$func ConvertTo t t t = e;")
-  static  void ConvertTo (Expr _gt_arg1, Expr _gt_arg2, Expr _gt_arg3, Result _v_res1) throws RefalException
-  {
-    Expr _v_compose1 = Expr.getConcatenator ().toRight (_gt_arg1).toRight (_gt_arg2).toRight (_gt_arg3).yield ();
+    Expr _v_compose1 = Expr.concat (_gt_arg1, _gt_arg2);
     if (!_v_compose1.isSymbolAt (0))
     {
@@ -3870 +3790 @@
     Expr _vt_var = Expr.empty;
     _vt_var = _v_compose1.subexpr ((0 + 1), 1);
-    Expr _vt_convVar = Expr.empty;
-    _vt_convVar = _v_compose1.subexpr ((0 + 1 + 1), 1);
     if (_vt_var.isSymbolAt (0))
     {
@@ -3883 +3801 @@
       throw new RefalException ("org.refal.plus.compiler.rfp_asail_java", "ConvertTo", "Unexpected fail");
     }
-    int _v_len___dollar_tmp_m_545_m_23 = (_v_len1 - _v_len2);
+    int _v_len___dollar_tmp_m_531_m_23 = (_v_len1 - _v_len2);
     if (!_v_deref__var.isSymbolAt (0))
     {
@@ -3890 +3808 @@
     Expr _vs_refType = Expr.empty;
     _vs_refType = _v_deref__var.subexpr (0, 1);
-    Expr _ve__dollar_tmp_m_545_m_23 = Expr.empty;
-    _ve__dollar_tmp_m_545_m_23 = _v_deref__var.subexpr ((0 + 1), _v_len___dollar_tmp_m_545_m_23);
+    Expr _ve__dollar_tmp_m_531_m_23 = Expr.empty;
+    _ve__dollar_tmp_m_531_m_23 = _v_deref__var.subexpr ((0 + 1), _v_len___dollar_tmp_m_531_m_23);
     _block1: {
       _block1__branch1: {
-        if (!_vs_refType.termEquals (_c_193, 0))
+        if (!_vs_refType.termEquals (_c_176, 0))
         {
           break _block1__branch1;
         }
-        Result _ge_auxcall1 = new Result (Expr.empty);
-        refal.plus.JavaMangle.Rfp2Java (_vt_convVar, _ge_auxcall1);
-        Result _ge_auxcall2 = new Result (Expr.empty);
-        refal.plus.JavaMangle.Rfp2Java (_vt_var, _ge_auxcall2);
-        Result _ge_auxcall3 = new Result (Expr.empty);
-        ConvertTo2 (_vs_javaType, Expr.concat (_ge_auxcall2.getExpr (), _c_194), _ge_auxcall3);
-        _v_res1.assign (new Expr ((Comparable) Expr.getConcatenator ().toRight (_vs_javaType).toRight (_c_40).toRight (_ge_auxcall1.getExpr ()).toRight (_c_55).toRight (_ge_auxcall3.getExpr ()).toRight (_c_6).yield ()));
+        _block2: {
+          _block2__branch1: {
+            _block3: {
+              _block3__branch1: {
+                if (!_vs_javaType.termEquals (_c_177, 0))
+                {
+                  break _block3__branch1;
+                }
+                break _block3;
+              }
+              _block3__branch2: {
+                if (!_vs_javaType.termEquals (_c_178, 0))
+                {
+                  break _block3__branch2;
+                }
+                break _block3;
+              }
+              _block3__branch3: {
+                if (!_vs_javaType.termEquals (_c_179, 0))
+                {
+                  break _block3__branch3;
+                }
+                break _block3;
+              }
+              _block3__branch4: {
+                if (!_vs_javaType.termEquals (_c_180, 0))
+                {
+                  break _block3__branch4;
+                }
+                break _block3;
+              }
+              _block3__branch5: {
+                if (!_vs_javaType.termEquals (_c_181, 0))
+                {
+                  break _block3__branch5;
+                }
+                break _block3;
+              }
+              if (!_vs_javaType.termEquals (_c_182, 0))
+              {
+                break _block2__branch1;
+              }
+            }
+            Result _ge_auxcall1 = new Result (Expr.empty);
+            refal.plus.JavaMangle.Rfp2Java (_vt_var, _ge_auxcall1);
+            _v_res1.assign (Expr.getConcatenator ().toRight (_c_185).toRight (_vs_javaType).toRight (_c_184).toRight (_ge_auxcall1.getExpr ()).toRight (_c_183).yield ());
+            break _block2;
+          }
+          Result _ge_auxcall2 = new Result (Expr.empty);
+          refal.plus.JavaMangle.Rfp2Java (_vt_var, _ge_auxcall2);
+          _v_res1.assign (Expr.getConcatenator ().toRight (_c_188).toRight (_vs_javaType).toRight (_c_187).toRight (_ge_auxcall2.getExpr ()).toRight (_c_186).yield ());
+        }
         break _block1;
       }
-      if (!_vs_refType.termEquals (_c_195, 0))
+      if (!_vs_refType.termEquals (_c_189, 0))
       {
         throw new RefalException ("org.refal.plus.compiler.rfp_asail_java", "ConvertTo", "Unexpected fail");
@@ -3920 +3883 @@
       }
       int _v_len__javaElemType = (_v_len3 - _v_len4);
-      if (!_c_196.equals (_v_ToChars1.getExpr (), (0 + _v_len__javaElemType)))
+      if (!_c_190.equals (_v_ToChars1.getExpr (), (0 + _v_len__javaElemType)))
       {
         throw new RefalException ("org.refal.plus.compiler.rfp_asail_java", "ConvertTo", "Unexpected fail");
@@ -3928 +3891 @@
       Result _vs_javaElemType = new Result (Expr.empty);
       refal.plus.Convert.ToWord (_ve_javaElemType, _vs_javaElemType);
-      Result _ge_auxcall4 = new Result (Expr.empty);
-      refal.plus.JavaMangle.Rfp2Java (_vt_convVar, _ge_auxcall4);
-      Result _ge_auxcall5 = new Result (Expr.empty);
-      refal.plus.JavaMangle.Rfp2Java (_vt_var, _ge_auxcall5);
-      Result _ge_auxcall6 = new Result (Expr.empty);
-      refal.plus.JavaMangle.Rfp2Java (_vt_convVar, _ge_auxcall6);
-      Result _ge_auxcall7 = new Result (Expr.empty);
-      refal.plus.JavaMangle.Rfp2Java (_vt_convVar, _ge_auxcall7);
-      Result _ge_auxcall8 = new Result (Expr.empty);
-      refal.plus.JavaMangle.Rfp2Java (_vt_var, _ge_auxcall8);
-      Result _ge_auxcall9 = new Result (Expr.empty);
-      ConvertTo2 (_vs_javaElemType.getExpr (), Expr.concat (_ge_auxcall8.getExpr (), _c_197), _ge_auxcall9);
-      _v_res1.assign (Expr.concat ((Comparable) Expr.getConcatenator ().toRight (_vs_javaType).toRight (_ge_auxcall4.getExpr ()).toRight (_c_200).toRight (_vs_javaElemType.getExpr ()).toRight (_c_199).toRight (_ge_auxcall5.getExpr ()).toRight (_c_198).yield (), (Comparable) Expr.getConcatenator ().toRight (_c_203).toRight (_ge_auxcall6.getExpr ()).toRight (_c_202).toRight ((Comparable) Expr.getConcatenator ().toRight (_ge_auxcall7.getExpr ()).toRight (_c_201).toRight (_ge_auxcall9.getExpr ()).toRight (_c_6).yield ()).yield ()));
+      _block4: {
+        _block4__branch1: {
+          _block5: {
+            _block5__branch1: {
+              if (!_vs_javaElemType.getExpr ().termEquals (_c_177, 0))
+              {
+                break _block5__branch1;
+              }
+              break _block5;
+            }
+            _block5__branch2: {
+              if (!_vs_javaElemType.getExpr ().termEquals (_c_178, 0))
+              {
+                break _block5__branch2;
+              }
+              break _block5;
+            }
+            _block5__branch3: {
+              if (!_vs_javaElemType.getExpr ().termEquals (_c_179, 0))
+              {
+                break _block5__branch3;
+              }
+              break _block5;
+            }
+            _block5__branch4: {
+              if (!_vs_javaElemType.getExpr ().termEquals (_c_180, 0))
+              {
+                break _block5__branch4;
+              }
+              break _block5;
+            }
+            _block5__branch5: {
+              if (!_vs_javaElemType.getExpr ().termEquals (_c_181, 0))
+              {
+                break _block5__branch5;
+              }
+              break _block5;
+            }
+            if (!_vs_javaElemType.getExpr ().termEquals (_c_182, 0))
+            {
+              break _block4__branch1;
+            }
+          }
+          Result _ge_auxcall3 = new Result (Expr.empty);
+          refal.plus.JavaMangle.Rfp2Java (_vt_var, _ge_auxcall3);
+          _v_res1.assign (Expr.getConcatenator ().toRight (_c_185).toRight (_vs_javaElemType.getExpr ()).toRight (_c_191).toRight (_ge_auxcall3.getExpr ()).toRight (_c_45).yield ());
+          break _block4;
+        }
+        Result _ge_auxcall4 = new Result (Expr.empty);
+        refal.plus.JavaMangle.Rfp2Java (_vt_var, _ge_auxcall4);
+        Result _ge_auxcall5 = new Result (Expr.empty);
+        refal.plus.JavaMangle.Rfp2Java (_vt_var, _ge_auxcall5);
+        _v_res1.assign (Expr.getConcatenator ().toRight (_c_188).toRight (_vs_javaType).toRight (_c_195).toRight (_ge_auxcall4.getExpr ()).toRight (_c_194).toRight (_vs_javaElemType.getExpr ()).toRight (_c_193).toRight (_ge_auxcall5.getExpr ()).toRight (_c_192).yield ());
+      }
     }
   }
 
-  @RefalFormat("$func ConvertFrom2 s e = e;")
-  static  void ConvertFrom2 (Expr _vs_javaType, Expr _ve_varName, Result _v_res1) throws RefalException
+  @RefalFormat("$func ConvertFrom t e = e;")
+  static  void ConvertFrom (Expr _vt_var, Expr _ve_arg, Result _v_res1) throws RefalException
   {
-    _block1: {
-      _block1__branch1: {
-        _block2: {
-          _block2__branch1: {
-            if (!_vs_javaType.termEquals (_c_176, 0))
-            {
-              break _block2__branch1;
-            }
-            _v_res1.assign (Expr.getConcatenator ().toRight (_c_204).toRight (_ve_varName).toRight (_c_45).yield ());
-            break _block2;
-          }
-          _block2__branch2: {
-            if (!_vs_javaType.termEquals (_c_178, 0))
-            {
-              break _block2__branch2;
-            }
-            _v_res1.assign (Expr.getConcatenator ().toRight (_c_205).toRight (_ve_varName).toRight (_c_45).yield ());
-            break _block2;
-          }
-          _block3: {
-            _block3__branch1: {
-              if (!_vs_javaType.termEquals (_c_181, 0))
-              {
-                break _block3__branch1;
-              }
-              break _block3;
-            }
-            _block3__branch2: {
-              if (!_vs_javaType.termEquals (_c_184, 0))
-              {
-                break _block3__branch2;
-              }
-              break _block3;
-            }
-            _block3__branch3: {
-              if (!_vs_javaType.termEquals (_c_186, 0))
-              {
-                break _block3__branch3;
-              }
-              break _block3;
-            }
-            if (!_vs_javaType.termEquals (_c_188, 0))
-            {
-              break _block1__branch1;
-            }
-          }
-          _v_res1.assign (Expr.getConcatenator ().toRight (_c_206).toRight (_ve_varName).toRight (_c_45).yield ());
-        }
-        break _block1;
-      }
-      _v_res1.assign (Expr.getConcatenator ().toRight (_c_135).toRight (_ve_varName).toRight (_c_209).toRight (_ve_varName).toRight (_c_208).toRight (_vs_javaType).toRight (_c_207).toRight (_ve_varName).toRight (_c_45).yield ());
-    }
-  }
-
-  @RefalFormat("$func ConvertFrom s t t = e;")
-  static  void ConvertFrom (Expr _vs_javaType, Expr _vt_var, Expr _vt_convVar, Result _v_res1) throws RefalException
-  {
-    refal.plus.StdIO.WriteLn (Expr.getConcatenator ().toRight (_vs_javaType).toRight (_vt_var).toRight (_vt_convVar).yield ());
     if (_vt_var.isSymbolAt (0))
     {
@@ -4016 +3962 @@
       throw new RefalException ("org.refal.plus.compiler.rfp_asail_java", "ConvertFrom", "Unexpected fail");
     }
-    int _v_len___dollar_tmp_m_571_m_23 = (_v_len1 - _v_len2);
+    int _v_len___dollar_tmp_m_549_m_23 = (_v_len1 - _v_len2);
     if (!_v_deref__var.isSymbolAt (0))
     {
@@ -4023 +3969 @@
     Expr _vs_refType = Expr.empty;
     _vs_refType = _v_deref__var.subexpr (0, 1);
-    Expr _ve__dollar_tmp_m_571_m_23 = Expr.empty;
-    _ve__dollar_tmp_m_571_m_23 = _v_deref__var.subexpr ((0 + 1), _v_len___dollar_tmp_m_571_m_23);
+    Expr _ve__dollar_tmp_m_549_m_23 = Expr.empty;
+    _ve__dollar_tmp_m_549_m_23 = _v_deref__var.subexpr ((0 + 1), _v_len___dollar_tmp_m_549_m_23);
     _block1: {
       _block1__branch1: {
-        if (!_vs_refType.termEquals (_c_193, 0))
+        if (!_vs_refType.termEquals (_c_176, 0))
         {
           break _block1__branch1;
         }
-        Result _ge_auxcall1 = new Result (Expr.empty);
-        refal.plus.JavaMangle.Rfp2Java (_vt_var, _ge_auxcall1);
-        Result _ge_auxcall2 = new Result (Expr.empty);
-        refal.plus.JavaMangle.Rfp2Java (_vt_convVar, _ge_auxcall2);
-        Result _ge_auxcall3 = new Result (Expr.empty);
-        ConvertFrom2 (_vs_javaType, _ge_auxcall2.getExpr (), _ge_auxcall3);
-        _v_res1.assign (new Expr ((Comparable) Expr.getConcatenator ().toRight (_ge_auxcall1.getExpr ()).toRight (_c_210).toRight (_ge_auxcall3.getExpr ()).toRight (_c_75).yield ()));
+        _v_res1.assign (Expr.getConcatenator ().toRight (_c_196).toRight (_ve_arg).toRight (_c_45).yield ());
         break _block1;
       }
-      if (!_vs_refType.termEquals (_c_195, 0))
+      if (!_vs_refType.termEquals (_c_189, 0))
       {
         throw new RefalException ("org.refal.plus.compiler.rfp_asail_java", "ConvertFrom", "Unexpected fail");
       }
-      Result _v_ToChars1 = new Result (Expr.empty);
-      refal.plus.Convert.ToChars (_vs_javaType, _v_ToChars1);
-      int _v_len3 = _v_ToChars1.getExpr ().length ();
-      int _v_len4 = 2;
-      if (_v_len3 < _v_len4)
-      {
-        throw new RefalException ("org.refal.plus.compiler.rfp_asail_java", "ConvertFrom", "Unexpected fail");
-      }
-      int _v_len__javaElemType = (_v_len3 - _v_len4);
-      if (!_c_196.equals (_v_ToChars1.getExpr (), (0 + _v_len__javaElemType)))
-      {
-        throw new RefalException ("org.refal.plus.compiler.rfp_asail_java", "ConvertFrom", "Unexpected fail");
-      }
-      Expr _ve_javaElemType = Expr.empty;
-      _ve_javaElemType = _v_ToChars1.getExpr ().subexpr (0, _v_len__javaElemType);
-      Result _vs_javaElemType = new Result (Expr.empty);
-      refal.plus.Convert.ToWord (_ve_javaElemType, _vs_javaElemType);
-      Result _ge_auxcall4 = new Result (Expr.empty);
-      refal.plus.JavaMangle.Rfp2Java (_vt_var, _ge_auxcall4);
-      Result _ge_auxcall5 = new Result (Expr.empty);
-      refal.plus.JavaMangle.Rfp2Java (_vt_convVar, _ge_auxcall5);
-      Result _ge_auxcall6 = new Result (Expr.empty);
-      refal.plus.JavaMangle.Rfp2Java (_vt_var, _ge_auxcall6);
-      Result _ge_auxcall7 = new Result (Expr.empty);
-      refal.plus.JavaMangle.Rfp2Java (_vt_var, _ge_auxcall7);
-      Result _ge_auxcall8 = new Result (Expr.empty);
-      refal.plus.JavaMangle.Rfp2Java (_vt_convVar, _ge_auxcall8);
-      Result _ge_auxcall9 = new Result (Expr.empty);
-      ConvertFrom2 (_vs_javaElemType.getExpr (), Expr.concat (_ge_auxcall8.getExpr (), _c_211), _ge_auxcall9);
-      Result _ge_auxcall10 = new Result (Expr.empty);
-      refal.plus.JavaMangle.Rfp2Java (_vt_var, _ge_auxcall10);
-      Result _ge_auxcall11 = new Result (Expr.empty);
-      refal.plus.JavaMangle.Rfp2Java (_vt_var, _ge_auxcall11);
-      _v_res1.assign (Expr.getConcatenator ().toRight ((Comparable) Expr.getConcatenator ().toRight (_c_214).toRight (_ge_auxcall4.getExpr ()).toRight (_c_213).toRight (_ge_auxcall5.getExpr ()).toRight (_c_212).yield ()).toRight ((Comparable) Expr.getConcatenator ().toRight (_c_216).toRight (_ge_auxcall6.getExpr ()).toRight (_c_202).toRight ((Comparable) Expr.getConcatenator ().toRight (_c_215).toRight (_ge_auxcall7.getExpr ()).toRight (_c_201).toRight (_ge_auxcall9.getExpr ()).toRight (_c_6).yield ()).yield ()).toRight ((Comparable) Expr.getConcatenator ().toRight (_ge_auxcall10.getExpr ()).toRight (_c_217).toRight (_ge_auxcall11.getExpr ()).toRight (_c_75).yield ()).yield ());
+      _v_res1.assign (Expr.getConcatenator ().toRight (_c_197).toRight (_ve_arg).toRight (_c_45).yield ());
     }
   }
 
   @RefalFormat("$func WrapGen s s t (e) (e) e = e;")
-  static  void WrapGen (Expr _vs_linkage, Expr _vs_tag, Expr _vt_qname, Expr _ve_in, Expr _ve_out, Expr _ve_native, Result _v_res1) throws RefalException
+  static  void WrapGen (Expr _gs_arg1, Expr _gs_arg2, Expr _gt_arg3, Expr _ge_arg4, Expr _ge_arg5, Expr _ge_arg6, Result _v_res1) throws RefalException
   {
+    int _v_len1 = (_ge_arg6.length () + 5);
+    int _v_len2 = 5;
+    if (_v_len1 < _v_len2)
+    {
+      throw new RefalException ("org.refal.plus.compiler.rfp_asail_java", "WrapGen", "Unexpected fail");
+    }
+    int _v_len__native = (_v_len1 - _v_len2);
+    Expr _v_compose1 = Expr.getConcatenator ().toRight (_gs_arg1).toRight (_gs_arg2).toRight (_gt_arg3).toRight ((Comparable<?>) _ge_arg4).toRight ((Comparable<?>) _ge_arg5).toRight (_ge_arg6).yield ();
+    if (_v_compose1.isSymbolAt ((0 + 1 + 1 + 1)))
+    {
+      throw new RefalException ("org.refal.plus.compiler.rfp_asail_java", "WrapGen", "Unexpected fail");
+    }
+    if (_v_compose1.isSymbolAt ((0 + 1 + 1 + 1 + 1)))
+    {
+      throw new RefalException ("org.refal.plus.compiler.rfp_asail_java", "WrapGen", "Unexpected fail");
+    }
+    Expr _v_deref__compose1 = (Expr) _v_compose1.at ((0 + 1 + 1 + 1));
+    Expr _v_deref__compose12 = (Expr) _v_compose1.at ((0 + 1 + 1 + 1 + 1));
+    int _v_len3 = _v_deref__compose1.length ();
+    int _v_len4 = 0;
+    if (_v_len3 < _v_len4)
+    {
+      throw new RefalException ("org.refal.plus.compiler.rfp_asail_java", "WrapGen", "Unexpected fail");
+    }
+    int _v_len__in = (_v_len3 - _v_len4);
+    int _v_len5 = _v_deref__compose12.length ();
+    int _v_len6 = 0;
+    if (_v_len5 < _v_len6)
+    {
+      throw new RefalException ("org.refal.plus.compiler.rfp_asail_java", "WrapGen", "Unexpected fail");
+    }
+    int _v_len__out = (_v_len5 - _v_len6);
+    if (!_v_compose1.isSymbolAt (0))
+    {
+      throw new RefalException ("org.refal.plus.compiler.rfp_asail_java", "WrapGen", "Unexpected fail");
+    }
+    if (!_c_29.termEquals (_v_compose1, (0 + 1)))
+    {
+      throw new RefalException ("org.refal.plus.compiler.rfp_asail_java", "WrapGen", "Unexpected fail");
+    }
+    Expr _vs_linkage = Expr.empty;
+    _vs_linkage = _v_compose1.subexpr (0, 1);
+    Expr _vt_qname = Expr.empty;
+    _vt_qname = _v_compose1.subexpr ((0 + 1 + 1), 1);
+    Expr _ve_native = Expr.empty;
+    _ve_native = _v_compose1.subexpr ((0 + 1 + 1 + 1 + 1 + 1), _v_len__native);
+    Expr _ve_in = Expr.empty;
+    _ve_in = _v_deref__compose1.subexpr (0, _v_len__in);
+    Expr _ve_out = Expr.empty;
+    _ve_out = _v_deref__compose12.subexpr (0, _v_len__out);
+    _block1: {
+      _block1__branch1: {
+        Result _v_Get1 = new Result (Expr.empty);
+        refal.plus.Box.Get (Entry, _v_Get1);
+        if (_v_Get1.getExpr ().length () < 1)
+        {
+          break _block1__branch1;
+        }
+        Expr.SplitIterator _va_19 = _v_Get1.getExpr ().leftSplit(0);
+        _exit1: _continue1: for ( ; ; _va_19.next ())
+        {
+          Expr _ve__dollar_tmp_m_556_m_21 = _va_19.getLeft();
+          Expr _v_lsplit__Get1 = _va_19.getRight();
+          if (!_va_19.isValid ())
+          {
+            break _block1__branch1;
+          }
+          int _v_len7 = _v_lsplit__Get1.length ();
+          int _v_len8 = 1;
+          if (_v_len7 < _v_len8)
+          {
+            break _block1__branch1;
+          }
+          int _v_len___dollar_tmp_m_556_m_31 = (_v_len7 - _v_len8);
+          if (!_vt_qname.termEquals (_v_lsplit__Get1, 0))
+          {
+            continue _continue1;
+          }
+          Expr _ve__dollar_tmp_m_556_m_31 = Expr.empty;
+          _ve__dollar_tmp_m_556_m_31 = _v_lsplit__Get1.subexpr ((0 + 1), _v_len___dollar_tmp_m_556_m_31);
+          refal.plus.Box.Store (Entry_Name, _vt_qname);
+          break _exit1;
+        }
+        break _block1;
+      }
+    }
     Result _gs_auxcall1 = new Result (Expr.empty);
     refal.plus.Convert.ToWord (_ve_native, _gs_auxcall1);
@@ -4092 +4085 @@
     Result _ve_javaArgTypes = new Result (Expr.empty);
     NativeJava.DeclarationReader (_gs_auxcall1.getExpr (), _vs_static, _vs_javaResType, _vs_className, _vs_methodName, _ve_javaArgTypes);
-    Expr _ve_return__type = Expr.empty;
-    Expr _ve_return = Expr.empty;
-    _block1: {
-      _block1__branch1: {
-     

@@ -1 @@
-*.s
-*.dep
-rfp*.cc
-NativeJava.cc
-rfp*.hh
-rfp*.class
-rfp*.java
+*.cc *.hh *.class *.java