Inspector nearly finished, except for renaming methods

Baltasarq · May 16, 2016 · 22df450 · 22df450
1 parent 47284ea
commit 22df450
Show file tree

Hide file tree

Showing 65 changed files with 1,007 additions and 618 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 *.class
-out
+out/
 # Backup files
 *~
 *.bak

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/ToDo.txt b/ToDo.txt
@@ -3,4 +3,3 @@
 - Needs Math object with sqr, sqrt, PI.
 - Needs "os" object with import()... These could be imported objects stored in a special dir (part of the jar) that could be imported.
 - Needs libraries, such as Complex. This could be provided with import, and loaded as any transcription.
-- Store the last directory
diff --git a/src/com/devbaltasarq/pooi/core/Interpreter.java b/src/com/devbaltasarq/pooi/core/Interpreter.java
@@ -3,8 +3,8 @@
 import com.devbaltasarq.pooi.core.evaluables.Command;
 import com.devbaltasarq.pooi.core.evaluables.Method;
 import com.devbaltasarq.pooi.core.evaluables.Reference;
-import com.devbaltasarq.pooi.core.evaluables.method.InterpretedMethod;
-import com.devbaltasarq.pooi.core.evaluables.method.NativeMethod;
+import com.devbaltasarq.pooi.core.evaluables.methods.InterpretedMethod;
+import com.devbaltasarq.pooi.core.evaluables.methods.NativeMethod;
 import com.devbaltasarq.pooi.core.exceps.InterpretError;
 import com.devbaltasarq.pooi.core.objs.ObjectStr;
 

diff --git a/src/com/devbaltasarq/pooi/core/ObjectBag.java b/src/com/devbaltasarq/pooi/core/ObjectBag.java
@@ -258,6 +258,22 @@ public String getNameOrValueAsString() {
         return toret;
     }
 
+    /**
+     * Returns the number of attributes in this object
+     * @return The number of attributes, as an int.
+     */
+    public int getNumberOfAttributes() {
+        return this.attributes.size();
+    }
+
+    /**
+     * Returns the number of methods in this object
+     * @return the number of methods, as an int
+     */
+    public int getNumberOfMethods() {
+        return this.methods.size();
+    }
+
     /** @return the number of objects between this object and root, plus itself */
     public int getInheritanceLevel() {
         int toret = 1;
@@ -407,7 +423,7 @@ public String toJson()
     public Reference toReference()
     {
         Attribute[] path = this.getObjectPath();
-        ArrayList<String> toret = new ArrayList<>();
+        ArrayList<String> toret = new ArrayList<>( path.length );
 
         for(int i = 0; i < path.length; ++i) {
             toret.add( path[ i ].getName() );
@@ -594,6 +610,66 @@ public Attribute lookUpAttribute(String atrName)
         return toret;
     }
 
+    public void renameMember(String oldName, String newName) throws InterpretError
+    {
+        final Attribute attr = this.localLookUpAttribute( oldName );
+        final Method mth = this.localLookUpMethod( oldName );
+
+        if ( attr != null ) {
+            this.renameAttribute( oldName, newName );
+        }
+        else
+        if ( mth != null ) {
+            this.renameMethod( oldName, newName );
+        }
+        else {
+            throw new InterpretError( "member " + oldName + " was not found" );
+        }
+
+        return;
+    }
+
+    public void renameMethod(String oldName, String newName) throws InterpretError {
+
+    }
+
+    public void renameAttribute(String oldName, String newName) throws InterpretError {
+        final Attribute attr = this.localLookUpAttribute( oldName );
+        ObjectBag ref = null;
+
+        if ( attr != null ) {
+            try {
+                ref = attr.getReference();
+                if ( ref != null ) {
+                    ref.setName( newName );
+                    attr.setName( newName );
+                    this.attributes.remove( oldName );
+                    this.attributes.put( newName, attr );
+                } else {
+                    throw new InterpretError( "INTERNAL ERROR: reference points to void" );
+                }
+            } catch(InterpretError exc) {
+                if ( ref != null
+                  && ref.getName().equals( newName ) )
+                {
+                    ref.setName( oldName );
+                }
+
+                if ( attr != null
+                  && attr.getName().equals( newName ) )
+                {
+                    attr.setName( oldName );
+                    this.attributes.remove( newName );
+                    this.attributes.put( oldName, attr );
+                }
+
+                throw exc;
+            }
+        } else {
+            throw new InterpretError( "attribute " + oldName + " was not found" );
+        }
+    }
+
     /**
      * Returns an attribute by its name, in *this* object *only*
      * @param atrName The name of the attribute

diff --git a/src/com/devbaltasarq/pooi/core/Parser.java b/src/com/devbaltasarq/pooi/core/Parser.java
@@ -8,9 +8,9 @@
 import com.devbaltasarq.pooi.core.evaluables.literals.IntLiteral;
 import com.devbaltasarq.pooi.core.evaluables.literals.RealLiteral;
 import com.devbaltasarq.pooi.core.evaluables.literals.StrLiteral;
-import com.devbaltasarq.pooi.core.evaluables.method.InterpretedMethod;
-import com.devbaltasarq.pooi.core.evaluables.method.nativemethods.NativeMethodSet;
-import com.devbaltasarq.pooi.core.evaluables.method.nativemethods.NativeMethodStr;
+import com.devbaltasarq.pooi.core.evaluables.methods.InterpretedMethod;
+import com.devbaltasarq.pooi.core.evaluables.methods.nativemethods.NativeMethodSet;
+import com.devbaltasarq.pooi.core.evaluables.methods.nativemethods.NativeMethodStr;
 import com.devbaltasarq.pooi.core.exceps.InterpretError;
 
 import java.util.ArrayList;

diff --git a/src/com/devbaltasarq/pooi/core/Runtime.java b/src/com/devbaltasarq/pooi/core/Runtime.java
@@ -9,8 +9,8 @@
 import com.devbaltasarq.pooi.core.evaluables.literals.IntLiteral;
 import com.devbaltasarq.pooi.core.evaluables.literals.RealLiteral;
 import com.devbaltasarq.pooi.core.evaluables.literals.StrLiteral;
-import com.devbaltasarq.pooi.core.evaluables.method.InterpretedMethod;
-import com.devbaltasarq.pooi.core.evaluables.method.nativemethods.*;
+import com.devbaltasarq.pooi.core.evaluables.methods.InterpretedMethod;
+import com.devbaltasarq.pooi.core.evaluables.methods.nativemethods.*;
 import com.devbaltasarq.pooi.core.exceps.AttributeNotFound;
 import com.devbaltasarq.pooi.core.exceps.InterpretError;
 import com.devbaltasarq.pooi.core.objs.*;

diff --git a/src/com/devbaltasarq/pooi/core/evaluables/Method.java b/src/com/devbaltasarq/pooi/core/evaluables/Method.java
@@ -62,6 +62,27 @@ public static String getStringFrom(Evaluable e)
         return toret;
     }
 
+    /**
+     * Returns a list with the formal parameters of the method
+     * @return a primitive vector of String, containing the formal parameters
+     */
+    public abstract String[] getFormalParameters();
+
+    /**
+     * Returns a string with the formal parameters of the method
+     * @return a String, with the formal parameters
+     */
+    public String getFormalParametersAsString() {
+        StringBuilder toret = new StringBuilder();
+
+        for(String param: this.getFormalParameters()) {
+            toret.append( toret );
+            toret.append( ' ' );
+        }
+
+        return toret.toString().trim();
+    }
+
     /** @return Gets the body of the method as a representation in text */
     public abstract String getMethodBodyAsString();
 

diff --git a/.../evaluables/method/InterpretedMethod.java → ...evaluables/methods/InterpretedMethod.java b/.../evaluables/method/InterpretedMethod.java → ...evaluables/methods/InterpretedMethod.java
@@ -1,4 +1,4 @@
-package com.devbaltasarq.pooi.core.evaluables.method;
+package com.devbaltasarq.pooi.core.evaluables.methods;
 
 import com.devbaltasarq.pooi.core.*;
 import com.devbaltasarq.pooi.core.evaluables.Command;
@@ -47,7 +47,7 @@ public void setCmds(String cmds) throws InterpretError
 
     public void setRealParams(ObjectBag self, Evaluable[] args) throws InterpretError
     {
-        String[] formalParams = this.getFormalParams();
+        String[] formalParams = this.getFormalParameters();
 
         if ( args.length != formalParams.length ) {
             throw new InterpretError( "formal and real arguments do not match" );
@@ -145,7 +145,8 @@ public Evaluable getRealParameter(String id)
         return ( this.params.get( id ) );
     }
 
-    public String[] getFormalParams()
+    @Override
+    public String[] getFormalParameters()
     {
         return this.formalParams;
     }
@@ -157,7 +158,7 @@ public String getMethodBodyAsString() {
         toret.append( "{" );
 
         // Add params
-        for(String param: this.getFormalParams()) {
+        for(String param: this.getFormalParameters()) {
             toret.append( param );
             toret.append( ' ' );
         }

diff --git a/.../core/evaluables/method/NativeMethod.java → ...core/evaluables/methods/NativeMethod.java b/.../core/evaluables/method/NativeMethod.java → ...core/evaluables/methods/NativeMethod.java
@@ -1,4 +1,4 @@
-package com.devbaltasarq.pooi.core.evaluables.method;
+package com.devbaltasarq.pooi.core.evaluables.methods;
 
 import com.devbaltasarq.pooi.core.Evaluable;
 import com.devbaltasarq.pooi.core.ObjectBag;

diff --git a/...ethod/nativemethods/NativeMethodCopy.java → ...thods/nativemethods/NativeMethodCopy.java b/...ethod/nativemethods/NativeMethodCopy.java → ...thods/nativemethods/NativeMethodCopy.java
@@ -1,8 +1,8 @@
-package com.devbaltasarq.pooi.core.evaluables.method.nativemethods;
+package com.devbaltasarq.pooi.core.evaluables.methods.nativemethods;
 
 import com.devbaltasarq.pooi.core.Evaluable;
 import com.devbaltasarq.pooi.core.ObjectBag;
-import com.devbaltasarq.pooi.core.evaluables.method.NativeMethod;
+import com.devbaltasarq.pooi.core.evaluables.methods.NativeMethod;
 import com.devbaltasarq.pooi.core.exceps.InterpretError;
 
 /**
@@ -41,4 +41,9 @@ public ObjectBag doIt(ObjectBag ref, Evaluable[] params, StringBuilder msg)
     public int getNumParams() {
         return 0;
     }
+
+    @Override
+    public String[] getFormalParameters() {
+        return new String[ 0 ];
+    }
 }
diff --git a/...ativemethods/NativeMethodCreateChild.java → ...ativemethods/NativeMethodCreateChild.java b/...ativemethods/NativeMethodCreateChild.java → ...ativemethods/NativeMethodCreateChild.java
@@ -1,8 +1,8 @@
-package com.devbaltasarq.pooi.core.evaluables.method.nativemethods;
+package com.devbaltasarq.pooi.core.evaluables.methods.nativemethods;
 
 import com.devbaltasarq.pooi.core.Evaluable;
 import com.devbaltasarq.pooi.core.ObjectBag;
-import com.devbaltasarq.pooi.core.evaluables.method.NativeMethod;
+import com.devbaltasarq.pooi.core.evaluables.methods.NativeMethod;
 import com.devbaltasarq.pooi.core.exceps.InterpretError;
 
 /**
@@ -37,4 +37,9 @@ public ObjectBag doIt(ObjectBag ref, Evaluable[] params, StringBuilder msg)
     public int getNumParams() {
         return 0;
     }
+
+    @Override
+    public String[] getFormalParameters() {
+        return new String[ 0 ];
+    }
 }
diff --git a/...thod/nativemethods/NativeMethodErase.java → ...hods/nativemethods/NativeMethodErase.java b/...thod/nativemethods/NativeMethodErase.java → ...hods/nativemethods/NativeMethodErase.java
@@ -1,8 +1,8 @@
-package com.devbaltasarq.pooi.core.evaluables.method.nativemethods;
+package com.devbaltasarq.pooi.core.evaluables.methods.nativemethods;
 
 import com.devbaltasarq.pooi.core.Evaluable;
 import com.devbaltasarq.pooi.core.ObjectBag;
-import com.devbaltasarq.pooi.core.evaluables.method.NativeMethod;
+import com.devbaltasarq.pooi.core.evaluables.methods.NativeMethod;
 import com.devbaltasarq.pooi.core.exceps.InterpretError;
 
 /**
@@ -39,4 +39,9 @@ public ObjectBag doIt(ObjectBag ref, Evaluable[] params, StringBuilder msg)
     public int getNumParams() {
         return 1;
     }
+
+    @Override
+    public String[] getFormalParameters() {
+        return new String[]{ "attrName" };
+    }
 }
diff --git a/...od/nativemethods/NativeMethodGetName.java → ...ds/nativemethods/NativeMethodGetName.java b/...od/nativemethods/NativeMethodGetName.java → ...ds/nativemethods/NativeMethodGetName.java
@@ -1,9 +1,9 @@
-package com.devbaltasarq.pooi.core.evaluables.method.nativemethods;
+package com.devbaltasarq.pooi.core.evaluables.methods.nativemethods;
 
 import com.devbaltasarq.pooi.core.Evaluable;
 import com.devbaltasarq.pooi.core.ObjectBag;
 import com.devbaltasarq.pooi.core.Runtime;
-import com.devbaltasarq.pooi.core.evaluables.method.NativeMethod;
+import com.devbaltasarq.pooi.core.evaluables.methods.NativeMethod;
 import com.devbaltasarq.pooi.core.exceps.InterpretError;
 
 /**
@@ -33,4 +33,9 @@ public ObjectBag doIt(ObjectBag ref, Evaluable[] params, StringBuilder msg)
     public int getNumParams() {
         return 0;
     }
+
+    @Override
+    public String[] getFormalParameters() {
+        return new String[ 0 ];
+    }
 }
diff --git a/...od/nativemethods/NativeMethodGetPath.java → ...ds/nativemethods/NativeMethodGetPath.java b/...od/nativemethods/NativeMethodGetPath.java → ...ds/nativemethods/NativeMethodGetPath.java
@@ -1,9 +1,9 @@
-package com.devbaltasarq.pooi.core.evaluables.method.nativemethods;
+package com.devbaltasarq.pooi.core.evaluables.methods.nativemethods;
 
 import com.devbaltasarq.pooi.core.Evaluable;
 import com.devbaltasarq.pooi.core.ObjectBag;
 import com.devbaltasarq.pooi.core.Runtime;
-import com.devbaltasarq.pooi.core.evaluables.method.NativeMethod;
+import com.devbaltasarq.pooi.core.evaluables.methods.NativeMethod;
 import com.devbaltasarq.pooi.core.exceps.InterpretError;
 
 /**
@@ -33,4 +33,9 @@ public ObjectBag doIt(ObjectBag ref, Evaluable[] params, StringBuilder msg)
     public int getNumParams() {
         return 0;
     }
+
+    @Override
+    public String[] getFormalParameters() {
+        return new String[ 0 ];
+    }
 }
diff --git a/...hod/nativemethods/NativeMethodIntAbs.java → ...ods/nativemethods/NativeMethodIntAbs.java b/...hod/nativemethods/NativeMethodIntAbs.java → ...ods/nativemethods/NativeMethodIntAbs.java
@@ -1,9 +1,9 @@
-package com.devbaltasarq.pooi.core.evaluables.method.nativemethods;
+package com.devbaltasarq.pooi.core.evaluables.methods.nativemethods;
 
 import com.devbaltasarq.pooi.core.Evaluable;
 import com.devbaltasarq.pooi.core.ObjectBag;
 import com.devbaltasarq.pooi.core.Runtime;
-import com.devbaltasarq.pooi.core.evaluables.method.NativeMethod;
+import com.devbaltasarq.pooi.core.evaluables.methods.NativeMethod;
 import com.devbaltasarq.pooi.core.exceps.InterpretError;
 import com.devbaltasarq.pooi.core.objs.ObjectInt;
 
@@ -44,4 +44,9 @@ public ObjectBag doIt(ObjectBag ref, Evaluable[] params, StringBuilder msg)
     public int getNumParams() {
         return 0;
     }
+
+    @Override
+    public String[] getFormalParameters() {
+        return new String[ 0 ];
+    }
 }
diff --git a/...ativemethods/NativeMethodIntDivideBy.java → ...ativemethods/NativeMethodIntDivideBy.java b/...ativemethods/NativeMethodIntDivideBy.java → ...ativemethods/NativeMethodIntDivideBy.java
@@ -1,9 +1,9 @@
-package com.devbaltasarq.pooi.core.evaluables.method.nativemethods;
+package com.devbaltasarq.pooi.core.evaluables.methods.nativemethods;
 
 import com.devbaltasarq.pooi.core.Evaluable;
 import com.devbaltasarq.pooi.core.ObjectBag;
 import com.devbaltasarq.pooi.core.Runtime;
-import com.devbaltasarq.pooi.core.evaluables.method.NativeMethod;
+import com.devbaltasarq.pooi.core.evaluables.methods.NativeMethod;
 import com.devbaltasarq.pooi.core.exceps.InterpretError;
 import com.devbaltasarq.pooi.core.objs.ObjectInt;
 import com.devbaltasarq.pooi.core.objs.ObjectReal;
@@ -80,4 +80,9 @@ public ObjectBag doIt(ObjectBag ref, Evaluable[] params, StringBuilder msg)
     public int getNumParams() {
         return 1;
     }
+
+    @Override
+    public String[] getFormalParameters() {
+        return new String[]{ "x" };
+    }
 }
diff --git a/...tivemethods/NativeMethodIntIsEqualTo.java → ...tivemethods/NativeMethodIntIsEqualTo.java b/...tivemethods/NativeMethodIntIsEqualTo.java → ...tivemethods/NativeMethodIntIsEqualTo.java
@@ -1,9 +1,9 @@
-package com.devbaltasarq.pooi.core.evaluables.method.nativemethods;
+package com.devbaltasarq.pooi.core.evaluables.methods.nativemethods;
 
 import com.devbaltasarq.pooi.core.Evaluable;
 import com.devbaltasarq.pooi.core.ObjectBag;
 import com.devbaltasarq.pooi.core.Runtime;
-import com.devbaltasarq.pooi.core.evaluables.method.NativeMethod;
+import com.devbaltasarq.pooi.core.evaluables.methods.NativeMethod;
 import com.devbaltasarq.pooi.core.exceps.InterpretError;
 import com.devbaltasarq.pooi.core.objs.ObjectInt;
 import com.devbaltasarq.pooi.core.objs.ObjectReal;
@@ -64,4 +64,9 @@ public ObjectBag doIt(ObjectBag ref, Evaluable[] params, StringBuilder msg)
     public int getNumParams() {
         return 1;
     }
+
+    @Override
+    public String[] getFormalParameters() {
+        return new String[]{ "x" };
+    }
 }
-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     *.class
-    out
+    out/
     # Backup files
     *~
     *.bak
@@ Expand Down @@