Changeset 1751

Timestamp:

05/30/08 11:21:00 (18 months ago)

Author:

dr2chase

Message:

Additional cleanups; also moved license file to proper place.

Location:

trunk

Files:

• LICENSE (moved) (moved from trunk/ProjectFortress/LICENSE)
• ProjectFortress/src/com/sun/fortress/interpreter/env/BetterEnv.java (modified) (6 diffs)
• ProjectFortress/src/com/sun/fortress/interpreter/evaluator/BaseEnv.java (modified) (1 diff)
• ProjectFortress/src/com/sun/fortress/interpreter/evaluator/CommonEnv.java (modified) (1 diff)
• ProjectFortress/src/com/sun/fortress/interpreter/evaluator/EmptyEnv.java (modified) (1 diff)
• ProjectFortress/src/com/sun/fortress/interpreter/evaluator/Environment.java (modified) (1 diff)

trunk/ProjectFortress/src/com/sun/fortress/interpreter/env/BetterEnv.java

@@ -197 +197 @@
     }
     
-    public BetterEnv extend(BetterEnv additions) {
-        return new BetterEnv(this, additions);
-    }
-
-    public BetterEnv extendAt(HasAt x) {
-        return new BetterEnv(this, x);
-    }
-
-    public BetterEnv extend() {
-        return new BetterEnv(this, this.getAt());
-    }
-
-    private void augment(BetterEnv existing, BetterEnv additions) {
+     private void augment(BetterEnv existing, BetterEnv additions) {
         type_env = augment(existing.type_env, additions.type_env);
         nat_env = augment(existing.nat_env, additions.nat_env);
@@ -220 +208 @@
     }
 
-   static <Result> BATreeNode<String, Result> augment(
+   private static <Result> BATreeNode<String, Result> augment(
             BATreeNode<String, Result> original,
             BATreeNode<String, Result> toBeAdded) {
@@ -228 +216 @@
     }
 
-    static <Result> BATreeNode<String, Result> augmentRecursive(
+    private static <Result> BATreeNode<String, Result> augmentRecursive(
             BATreeNode<String, Result> original,
             BATreeNode<String, Result> toBeAdded) {
@@ -245 +233 @@
     }
 
-    static public String string(FValue f1) {
-        return ((FString) f1).getString();
-    }
-
-    private <Result> Result get(BATreeNode<String, Result> table, String index) {
+     private <Result> Result get(BATreeNode<String, Result> table, String index) {
         Result r = null;
         if (table != null) {
@@ -417 +401 @@
     }
 
-    public void assignValue(HasAt loc, String str, FValue value) {
+    public BetterEnv extend(BetterEnv additions) {
+        return new BetterEnv(this, additions);
+    }
+
+    public BetterEnv extendAt(HasAt x) {
+        return new BetterEnv(this, x);
+    }
+
+    public BetterEnv extend() {
+        return new BetterEnv(this, this.getAt());
+    }
+
+    static public String string(FValue f1) {
+        return ((FString) f1).getString();
+    }
+
+   public void assignValue(HasAt loc, String str, FValue value) {
         FValue v = get(var_env, str);
         if (v instanceof ReferenceCell) {
@@ -456 +456 @@
 //    }
 
-    public Boolean casValue(String str, FValue old_value, FValue new_value) {
-        return bug("Cas on envs no longer supported");
-    }
-
-
+ 
     public void debugPrint(String debugString) {
         if (debug)

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/BaseEnv.java

@@ -46 +46 @@
      * @see com.sun.fortress.interpreter.evaluator.Environment#casValue(com.sun.fortress.interpreter.evaluator.values.FValue, com.sun.fortress.interpreter.evaluator.values.FValue, com.sun.fortress.interpreter.evaluator.values.FValue)
      */
-    final public Boolean casValue(FValue f1, FValue old_value, FValue new_value) {
-        return casValue(string(f1), old_value, new_value);
-    }
-
+  
     final public void putValue(FValue f1, FValue f2) {
         putValue(string(f1), f2);

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/CommonEnv.java

@@ -80 +80 @@
             return x;
     }
-
-    abstract public  Boolean casValue(String str, FValue old_value, FValue new_value) ;
 
     abstract public  Closure getRunClosure() ;

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/EmptyEnv.java

@@ -34 +34 @@
 public class EmptyEnv extends CommonEnv {
 
-    /* (non-Javadoc)
-     * @see com.sun.fortress.interpreter.evaluator.CommonEnv#casValue(java.lang.String, com.sun.fortress.interpreter.evaluator.values.FValue, com.sun.fortress.interpreter.evaluator.values.FValue)
-     */
-    @Override
-    public Boolean casValue(String str, FValue old_value, FValue new_value) {
-        return bug("Empty environment does not support cas");
-    }
-
-
 
     /* (non-Javadoc)

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/Environment.java

@@ -89 +89 @@
     public abstract void assignValue(HasAt loc, String str, FValue f2);
 
-    // public abstract void assignValue(FValue f1, FValue f2);
-
-    public abstract Boolean casValue(String str, FValue old_value, FValue new_value);
-
-    public abstract Boolean casValue(FValue f1, FValue old_value, FValue new_value);
-
     public abstract Closure getRunClosure();