Changeset 4040

Timestamp:

Dec 4, 2008, 11:33:05 AM (12 years ago)

Author:

orlov

Message:

• Fixed Expr creation in multi-threaded programs (branch with holes).
• Fixed error messages in Arithm library.

Location:

to-imperative/trunk/java/java

Files:

• org/refal/plus/Expr.java (modified) (6 diffs)
• refal/plus/Arithm.java (modified) (2 diffs)

to-imperative/trunk/java/java/org/refal/plus/Expr.java

@@ -22 +22 @@
     public static int right_copy = 0;
     public static int both_copy = 0;
-
-    private static final InplaceConcatenator concatenator = new InplaceConcatenator();
 
     private final Comparable<?>[] terms;
@@ -248 +246 @@
         }
         both_copy++;
-        return concatenator.reinit(len).toRight(expr1).toRight(expr2).yield();
+        return getConcatenator(len).toRight(expr1).toRight(expr2).yield();
     }
 
@@ -280 +278 @@
         }
         both_copy++;
-        return concatenator.reinit(expr.length + 1).toRight(expr).toRight(obj).yield();
+        return getConcatenator(expr.length + 1).toRight(expr).toRight(obj).yield();
     }
 
@@ -301 +299 @@
         }
         both_copy++;
-        return concatenator.reinit(expr.length + 1).toRight(obj).toRight(expr).yield();
+        return getConcatenator(expr.length + 1).toRight(obj).toRight(expr).yield();
     }
 
@@ -320 +318 @@
         assert seq != null : "seq=" + seq;
         int len = seq.length();
-        Expr.Concatenator ec = concatenator.reinit(len);
+        Expr.Concatenator ec = getConcatenator(len);
         for (int i = 0; i < len; i++)
             ec.toRight(seq.charAt(i));
@@ -604 +602 @@
         private int length;
 
-        private InplaceConcatenator reinit (int initialCapacity) {
-            terms = new Comparable[initialCapacity * 2 + 4];
-            length = 0;
-            return this;
-        }
-
-        private InplaceConcatenator () {
-            terms = null;
-            length = 0;
-        }
-
         public InplaceConcatenator (int initialCapacity) {
             assert initialCapacity >= 0;

to-imperative/trunk/java/java/refal/plus/Arithm.java

@@ -58 +58 @@
             rem.assign(Util.getBigInteger(int1).remainder(Util.getBigInteger(int2)));
         } catch (ArithmeticException e) {
-            throw new RefalException("Arithm", "Div", "Divide by zero");
+            throw new RefalException("Arithm", "Rem", "Divide by zero");
         } catch (ClassCastException e) {
             throw new RefalException("Arithm", "Rem", "Invalid argument");
@@ -94 +94 @@
             res.assign(Util.getBigInteger(int1).abs());
         } catch (ClassCastException e) {
-            throw new RefalException("Arithm", "Gcd", "Invalid argument");
+            throw new RefalException("Arithm", "Abs", "Invalid argument");
         }
     }