OSDN Git Service

save
authoriga <tosiki.iga@nifty.ne.jp>
Thu, 3 Apr 2014 12:33:23 +0000 (21:33 +0900)
committeriga <tosiki.iga@nifty.ne.jp>
Thu, 3 Apr 2014 12:33:23 +0000 (21:33 +0900)
20 files changed:
jcfa/src/jp/igapyon/jcfa/util/JcfaWriteUtil.java
jcfa/src/jp/igapyon/jcfa/vo/JcfaOperandStack.java
jcfa/src/jp/igapyon/jcfa/vo/item/JcfaItem.java [new file with mode: 0644]
jcfa/src/jp/igapyon/jcfa/vo/item/JcfaItemLocalVariable.java [moved from jcfa/src/jp/igapyon/jcfa/vo/operandstack/JcfaOSLocalVariable.java with 74% similarity]
jcfa/src/jp/igapyon/jcfa/vo/item/JcfaItemReference.java [new file with mode: 0644]
jcfa/src/jp/igapyon/jcfa/vo/operandstack/JcfaOSNode.java [deleted file]
jcfa/src/jp/igapyon/jcfa/vo/operandstack/JcfaOSRef.java [deleted file]
jcfa/src/jp/igapyon/jcfa/vo/operandstack/JcfaOSString.java [deleted file]
jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaField.jcfa
jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaFrame.jcfa
jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaMethod.jcfa
jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaNode.jcfa
jcfa/testJavaClass/output/test/TestJavaClass001.jcfa
jcfa/testJavaClass/output/test/TestJavaClass002.jcfa
jcfa/testJavaClass/output/test/TestJavaClass003.jcfa
jcfa/testJavaClass/output/test/TestJavaClass011.jcfa
jcfa/testJavaClass/output/test/TestJavaClass021.jcfa
jcfa/testJavaClass/output/test/TestJavaClass031.jcfa
jcfa/testJavaClass/output/test/TestJavaClass032.jcfa
jcfa/testJavaClass/output/test/TestJavaClass041.jcfa

index b090b0b..6c5d8fe 100644 (file)
@@ -11,10 +11,9 @@ import jp.igapyon.jcfa.vo.JcfaComment;
 import jp.igapyon.jcfa.vo.JcfaField;
 import jp.igapyon.jcfa.vo.JcfaMethod;
 import jp.igapyon.jcfa.vo.JcfaUnit;
-import jp.igapyon.jcfa.vo.operandstack.JcfaOSLocalVariable;
-import jp.igapyon.jcfa.vo.operandstack.JcfaOSNode;
-import jp.igapyon.jcfa.vo.operandstack.JcfaOSRef;
-import jp.igapyon.jcfa.vo.operandstack.JcfaOSString;
+import jp.igapyon.jcfa.vo.item.JcfaItem;
+import jp.igapyon.jcfa.vo.item.JcfaItemLocalVariable;
+import jp.igapyon.jcfa.vo.item.JcfaItemReference;
 
 import org.apache.bcel.Constants;
 import org.apache.bcel.classfile.JavaClass;
@@ -141,7 +140,7 @@ public class JcfaWriteUtil {
 
                        switch (jcfaCode.getOpcode()) {
                        case Constants.ALOAD_0: {
-                               final JcfaOSLocalVariable osLocalVariable = new JcfaOSLocalVariable();
+                               final JcfaItemLocalVariable osLocalVariable = new JcfaItemLocalVariable();
                                jcfaMethod.getFrame().getOperandStack().push(osLocalVariable);
                                osLocalVariable.setLocalVariable(jcfaMethod.getFrame()
                                                .getLocalVariableList().get(0));
@@ -155,22 +154,21 @@ public class JcfaWriteUtil {
                                break;
                        }
                        case Constants.GETSTATIC: {
-                               final JcfaOSRef osRef = new JcfaOSRef();
+                               final JcfaItemReference osRef = new JcfaItemReference();
                                jcfaMethod.getFrame().getOperandStack().push(osRef);
-                               osRef.setClassName(JcfaUtil.getConstantFieldrefString(jc,
+                               osRef.setObject(JcfaUtil.getConstantFieldrefString(jc,
                                                codes[1], codes[2]));
 
-                               jcfaCode.getComment().getCommentList()
-                                               .add(osRef.getClassName());
+                               jcfaCode.getComment().getCommentList().add(osRef.getObject());
                                break;
                        }
                        case Constants.LDC: {
-                               final JcfaOSString osString = new JcfaOSString();
+                               final JcfaItemReference osString = new JcfaItemReference();
                                jcfaMethod.getFrame().getOperandStack().push(osString);
-                               osString.setString(JcfaUtil.getConstantString(jc, codes[1]));
+                               osString.setObject(JcfaUtil.getConstantString(jc, codes[1]));
 
                                jcfaCode.getComment().getCommentList()
-                                               .add(osString.getString());
+                                               .add(osString.getObject());
                        }
                                break;
                        case Constants.INVOKEVIRTUAL:
@@ -183,15 +181,15 @@ public class JcfaWriteUtil {
                                jcfaCode.getComment().getCommentList()
                                                .add("TODO get args count from signature.");
                                // get n args.
-                               final JcfaOSNode osNodeArg0 = jcfaMethod.getFrame()
+                               final JcfaItem osNodeArg0 = jcfaMethod.getFrame()
                                                .getOperandStack().pop();
 
-                               final JcfaOSRef osRef = (JcfaOSRef) jcfaMethod.getFrame()
-                                               .getOperandStack().pop();
+                               final JcfaItemReference osRef = (JcfaItemReference) jcfaMethod
+                                               .getFrame().getOperandStack().pop();
 
                                jcfaCode.getComment()
                                                .getCommentList()
-                                               .add("" + osRef.getClassName() + "#"
+                                               .add("" + osRef.getObject() + "#"
                                                                + osNodeArg0.toString());
 
                        }
index d0c1ff5..575b7b8 100644 (file)
@@ -3,22 +3,22 @@ package jp.igapyon.jcfa.vo;
 import java.util.EmptyStackException;
 import java.util.Stack;
 
-import jp.igapyon.jcfa.vo.operandstack.JcfaOSNode;
-import jp.igapyon.jcfa.vo.operandstack.JcfaOSRef;
+import jp.igapyon.jcfa.vo.item.JcfaItem;
+import jp.igapyon.jcfa.vo.item.JcfaItemReference;
 
 public class JcfaOperandStack {
-       protected final Stack<JcfaOSNode> operandStack = new Stack<JcfaOSNode>();
+       protected final Stack<JcfaItem> operandStack = new Stack<JcfaItem>();
 
-       public void push(final JcfaOSNode operandStackNode) {
+       public void push(final JcfaItem operandStackNode) {
                operandStack.push(operandStackNode);
        }
 
-       public JcfaOSNode pop() {
+       public JcfaItem pop() {
                try {
                        return operandStack.pop();
                } catch (EmptyStackException ex) {
                        ex.printStackTrace();
-                       return new JcfaOSRef();
+                       return new JcfaItemReference();
                }
        }
 }
diff --git a/jcfa/src/jp/igapyon/jcfa/vo/item/JcfaItem.java b/jcfa/src/jp/igapyon/jcfa/vo/item/JcfaItem.java
new file mode 100644 (file)
index 0000000..63bed83
--- /dev/null
@@ -0,0 +1,4 @@
+package jp.igapyon.jcfa.vo.item;
+
+public abstract class JcfaItem {
+}
@@ -1,8 +1,8 @@
-package jp.igapyon.jcfa.vo.operandstack;
+package jp.igapyon.jcfa.vo.item;
 
 import jp.igapyon.jcfa.vo.JcfaLocalVariable;
 
-public class JcfaOSLocalVariable extends JcfaOSNode {
+public class JcfaItemLocalVariable extends JcfaItem {
        protected JcfaLocalVariable localVariable;
 
        public JcfaLocalVariable getLocalVariable() {
diff --git a/jcfa/src/jp/igapyon/jcfa/vo/item/JcfaItemReference.java b/jcfa/src/jp/igapyon/jcfa/vo/item/JcfaItemReference.java
new file mode 100644 (file)
index 0000000..cf9b2e8
--- /dev/null
@@ -0,0 +1,13 @@
+package jp.igapyon.jcfa.vo.item;
+
+public class JcfaItemReference extends JcfaItem {
+       protected String object;
+
+       public String getObject() {
+               return object;
+       }
+
+       public void setObject(String object) {
+               this.object = object;
+       }
+}
diff --git a/jcfa/src/jp/igapyon/jcfa/vo/operandstack/JcfaOSNode.java b/jcfa/src/jp/igapyon/jcfa/vo/operandstack/JcfaOSNode.java
deleted file mode 100644 (file)
index 7cfe25b..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-package jp.igapyon.jcfa.vo.operandstack;
-
-public abstract class JcfaOSNode {
-}
diff --git a/jcfa/src/jp/igapyon/jcfa/vo/operandstack/JcfaOSRef.java b/jcfa/src/jp/igapyon/jcfa/vo/operandstack/JcfaOSRef.java
deleted file mode 100644 (file)
index 9ad9415..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-package jp.igapyon.jcfa.vo.operandstack;
-
-public class JcfaOSRef extends JcfaOSNode {
-       protected String className;
-
-       public String getClassName() {
-               return className;
-       }
-
-       public void setClassName(String className) {
-               this.className = className;
-       }
-}
diff --git a/jcfa/src/jp/igapyon/jcfa/vo/operandstack/JcfaOSString.java b/jcfa/src/jp/igapyon/jcfa/vo/operandstack/JcfaOSString.java
deleted file mode 100644 (file)
index cfd0c7d..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-package jp.igapyon.jcfa.vo.operandstack;
-
-public class JcfaOSString extends JcfaOSNode {
-       protected String string;
-
-       public String getString() {
-               return string;
-       }
-
-       public void setString(String string) {
-               this.string = string;
-       }
-}
index 8f2c524..87e98e5 100644 (file)
@@ -20,7 +20,7 @@ public class JcfaField extends jp.igapyon.jcfa.vo.JcfaNode {
                /*
                 * 1: invokespecial jp/igapyon/jcfa/vo/JcfaNode#<init>()V TODO get args
                 * count from signature.
-                * null#jp.igapyon.jcfa.vo.operandstack.JcfaOSLocalVariable@132a3e
+                * null#jp.igapyon.jcfa.vo.item.JcfaItemLocalVariable@118dc75
                 */
 
                /* 4: return */
index 5ebc09e..f42fa6f 100644 (file)
@@ -15,8 +15,7 @@ public class JcfaFrame {
 
                /*
                 * 1: invokespecial java/lang/Object#<init>()V TODO get args count from
-                * signature.
-                * null#jp.igapyon.jcfa.vo.operandstack.JcfaOSLocalVariable@1e6c23c
+                * signature. null#jp.igapyon.jcfa.vo.item.JcfaItemLocalVariable@9046f8
                 */
 
                /*
@@ -34,7 +33,7 @@ public class JcfaFrame {
                /*
                 * 9: invokespecial java/util/ArrayList#<init>()V TODO get args count
                 * from signature.
-                * null#jp.igapyon.jcfa.vo.operandstack.JcfaOSLocalVariable@da1a1f
+                * null#jp.igapyon.jcfa.vo.item.JcfaItemLocalVariable@2364e5
                 */
 
                /*
@@ -56,7 +55,7 @@ public class JcfaFrame {
                /*
                 * 20: invokespecial jp/igapyon/jcfa/vo/JcfaOperandStack#<init>()V TODO
                 * get args count from signature.
-                * null#jp.igapyon.jcfa.vo.operandstack.JcfaOSLocalVariable@e9055b
+                * null#jp.igapyon.jcfa.vo.item.JcfaItemLocalVariable@1b51748
                 */
 
                /*
index e3884d7..522f9ca 100644 (file)
@@ -24,7 +24,7 @@ public class JcfaMethod extends jp.igapyon.jcfa.vo.JcfaNode {
                /*
                 * 1: invokespecial jp/igapyon/jcfa/vo/JcfaNode#<init>()V TODO get args
                 * count from signature.
-                * null#jp.igapyon.jcfa.vo.operandstack.JcfaOSLocalVariable@3a4d82
+                * null#jp.igapyon.jcfa.vo.item.JcfaItemLocalVariable@131a5af
                 */
 
                /*
@@ -42,7 +42,7 @@ public class JcfaMethod extends jp.igapyon.jcfa.vo.JcfaNode {
                /*
                 * 9: invokespecial java/util/ArrayList#<init>()V TODO get args count
                 * from signature.
-                * null#jp.igapyon.jcfa.vo.operandstack.JcfaOSLocalVariable@1b6aea4
+                * null#jp.igapyon.jcfa.vo.item.JcfaItemLocalVariable@74c252
                 */
 
                /*
@@ -64,7 +64,7 @@ public class JcfaMethod extends jp.igapyon.jcfa.vo.JcfaNode {
                /*
                 * 20: invokespecial java/util/ArrayList#<init>()V TODO get args count
                 * from signature.
-                * null#jp.igapyon.jcfa.vo.operandstack.JcfaOSLocalVariable@83d070
+                * null#jp.igapyon.jcfa.vo.item.JcfaItemLocalVariable@181ab44
                 */
 
                /*
@@ -86,7 +86,7 @@ public class JcfaMethod extends jp.igapyon.jcfa.vo.JcfaNode {
                /*
                 * 31: invokespecial jp/igapyon/jcfa/vo/JcfaFrame#<init>()V TODO get
                 * args count from signature.
-                * null#jp.igapyon.jcfa.vo.operandstack.JcfaOSLocalVariable@1e9749c
+                * null#jp.igapyon.jcfa.vo.item.JcfaItemLocalVariable@132a3e
                 */
 
                /*
index 2619498..bff8f8f 100644 (file)
@@ -13,8 +13,7 @@ public class JcfaNode {
 
                /*
                 * 1: invokespecial java/lang/Object#<init>()V TODO get args count from
-                * signature.
-                * null#jp.igapyon.jcfa.vo.operandstack.JcfaOSLocalVariable@5eae58
+                * signature. null#jp.igapyon.jcfa.vo.item.JcfaItemLocalVariable@ba2e7
                 */
 
                /*
@@ -32,7 +31,7 @@ public class JcfaNode {
                /*
                 * 9: invokespecial jp/igapyon/jcfa/vo/JcfaComment#<init>()V TODO get
                 * args count from signature.
-                * null#jp.igapyon.jcfa.vo.operandstack.JcfaOSLocalVariable@841c1
+                * null#jp.igapyon.jcfa.vo.item.JcfaItemLocalVariable@1f3f6ff
                 */
 
                /*
index 3129916..52ee7f3 100644 (file)
@@ -10,8 +10,7 @@ public class TestJavaClass001 {
 
                /*
                 * 1: invokespecial java/lang/Object#<init>()V TODO get args count from
-                * signature.
-                * null#jp.igapyon.jcfa.vo.operandstack.JcfaOSLocalVariable@1670f2b
+                * signature. null#jp.igapyon.jcfa.vo.item.JcfaItemLocalVariable@ffab3f
                 */
 
                /* 4: return */
@@ -33,7 +32,7 @@ public class TestJavaClass001 {
                 * 5: invokevirtual java/io/PrintStream#println(Ljava/lang/String;)V
                 * TODO get args count from signature. java.lang.System#out
                 * type:Ljava/io
-                * /PrintStream;#jp.igapyon.jcfa.vo.operandstack.JcfaOSString@114f7c0
+                * /PrintStream;#jp.igapyon.jcfa.vo.item.JcfaItemReference@143c919
                 */
 
                /* 8: return */
index c57192f..228147d 100644 (file)
@@ -20,8 +20,7 @@ public class TestJavaClass002 {
 
                /*
                 * 1: invokespecial java/lang/Object#<init>()V TODO get args count from
-                * signature.
-                * null#jp.igapyon.jcfa.vo.operandstack.JcfaOSLocalVariable@164813b
+                * signature. null#jp.igapyon.jcfa.vo.item.JcfaItemLocalVariable@1bc378f
                 */
 
                /*
index 938bd03..d858092 100644 (file)
@@ -25,8 +25,7 @@ public class TestJavaClass003 {
 
                /*
                 * 1: invokespecial java/lang/Object#<init>()V TODO get args count from
-                * signature.
-                * null#jp.igapyon.jcfa.vo.operandstack.JcfaOSLocalVariable@1bc378f
+                * signature. null#jp.igapyon.jcfa.vo.item.JcfaItemLocalVariable@1d0bf38
                 */
 
                /*
index ee881c7..88a762b 100644 (file)
@@ -10,8 +10,7 @@ public class TestJavaClass011 {
 
                /*
                 * 1: invokespecial java/lang/Object#<init>()V TODO get args count from
-                * signature.
-                * null#jp.igapyon.jcfa.vo.operandstack.JcfaOSLocalVariable@e1ccdf
+                * signature. null#jp.igapyon.jcfa.vo.item.JcfaItemLocalVariable@15c0729
                 */
 
                /* 4: return */
@@ -31,7 +30,7 @@ public class TestJavaClass011 {
                 * 5: invokevirtual java/io/PrintStream#println(Ljava/lang/String;)V
                 * TODO get args count from signature. java.lang.System#out
                 * type:Ljava/io
-                * /PrintStream;#jp.igapyon.jcfa.vo.operandstack.JcfaOSString@51762a
+                * /PrintStream;#jp.igapyon.jcfa.vo.item.JcfaItemReference@da1c9f
                 */
 
                /* 8: return */
index 2801885..0887fb4 100644 (file)
@@ -10,8 +10,7 @@ public class TestJavaClass021 {
 
                /*
                 * 1: invokespecial java/lang/Object#<init>()V TODO get args count from
-                * signature.
-                * null#jp.igapyon.jcfa.vo.operandstack.JcfaOSLocalVariable@1d0bf38
+                * signature. null#jp.igapyon.jcfa.vo.item.JcfaItemLocalVariable@1475116
                 */
 
                /* 4: return */
@@ -42,7 +41,7 @@ public class TestJavaClass021 {
                /*
                 * 9: invokevirtual java/io/PrintStream#println(I)V TODO get args count
                 * from signature.
-                * null#jp.igapyon.jcfa.vo.operandstack.JcfaOSRef@1ba0e0e
+                * null#jp.igapyon.jcfa.vo.item.JcfaItemReference@11c8643
                 */
 
                /*
index 7fcdc6d..61e2da7 100644 (file)
@@ -10,8 +10,7 @@ public class TestJavaClass031 {
 
                /*
                 * 1: invokespecial java/lang/Object#<init>()V TODO get args count from
-                * signature.
-                * null#jp.igapyon.jcfa.vo.operandstack.JcfaOSLocalVariable@181ab44
+                * signature. null#jp.igapyon.jcfa.vo.item.JcfaItemLocalVariable@119510f
                 */
 
                /* 4: return */
index 2c89cd9..59599eb 100644 (file)
@@ -10,8 +10,7 @@ public class TestJavaClass032 {
 
                /*
                 * 1: invokespecial java/lang/Object#<init>()V TODO get args count from
-                * signature.
-                * null#jp.igapyon.jcfa.vo.operandstack.JcfaOSLocalVariable@bc8928
+                * signature. null#jp.igapyon.jcfa.vo.item.JcfaItemLocalVariable@f75278
                 */
 
                /* 4: return */
index 1a84c29..7c82699 100644 (file)
@@ -10,8 +10,7 @@ public class TestJavaClass041 {
 
                /*
                 * 1: invokespecial java/lang/Object#<init>()V TODO get args count from
-                * signature.
-                * null#jp.igapyon.jcfa.vo.operandstack.JcfaOSLocalVariable@1e39a7c
+                * signature. null#jp.igapyon.jcfa.vo.item.JcfaItemLocalVariable@1ba0e0e
                 */
 
                /* 4: return */
@@ -35,7 +34,7 @@ public class TestJavaClass041 {
                 * 6: invokespecial
                 * java/lang/IllegalArgumentException#<init>(Ljava/lang/String;)V TODO
                 * get args count from signature.
-                * null#jp.igapyon.jcfa.vo.operandstack.JcfaOSString@1b34d17
+                * null#jp.igapyon.jcfa.vo.item.JcfaItemReference@1f0d2a3
                 */
 
                /*
@@ -54,7 +53,7 @@ public class TestJavaClass041 {
                 * 12: invokevirtual
                 * java/lang/IllegalArgumentException#printStackTrace()V TODO get args
                 * count from signature.
-                * null#jp.igapyon.jcfa.vo.operandstack.JcfaOSRef@8a43ba
+                * null#jp.igapyon.jcfa.vo.item.JcfaItemReference@194e2e5
                 */
 
                /* 15: return */