From 6c783a18c73dfbf07a139f166ed670bf64276d33 Mon Sep 17 00:00:00 2001 From: "pl@gohorb.ba-horb.de" Date: Tue, 22 Oct 2019 16:44:38 +0200 Subject: [PATCH] new file: ../../../../../PlugInBau.txt modified: ../../bytecode/javFiles/Faculty.jav modified: ../../bytecode/javFiles/OL.jav modified: ../../bytecode/javFiles/Y.jav modified: ../../bytecode/javFiles/mathStruc.jav --- PlugInBau.txt | 22 +++++++++++++++++++ .../resources/bytecode/javFiles/Faculty.jav | 7 +++--- src/test/resources/bytecode/javFiles/OL.jav | 12 +++++----- src/test/resources/bytecode/javFiles/Y.jav | 7 +++--- .../resources/bytecode/javFiles/mathStruc.jav | 1 - 5 files changed, 36 insertions(+), 13 deletions(-) create mode 100644 PlugInBau.txt diff --git a/PlugInBau.txt b/PlugInBau.txt new file mode 100644 index 00000000..a76097ad --- /dev/null +++ b/PlugInBau.txt @@ -0,0 +1,22 @@ +Repositories: Branches: JavaCompilerCore: simplyRes + JavaCompilerPlugin: copy_libs +JavaCompilerCore > mvn install -Dskip.test=true + +[INFO] Installing /Users/pl/workspace_oxygen/JavaCompilerCore/target/JavaTXcompiler-0.2.jar to /Users/pl/.m2/repository/de/dhbwstuttgart/JavaTXcompiler/0.2/JavaTXcompiler-0.2.jar +[INFO] Installing /Users/pl/workspace_oxygen/JavaCompilerCore/pom.xml to /Users/pl/.m2/repository/de/dhbwstuttgart/JavaTXcompiler/0.2/JavaTXcompiler-0.2.pom +[INFO] Installing /Users/pl/workspace_oxygen/JavaCompilerCore/target/JavaTXcompiler-0.2-jar-with-dependencies.jar to /Users/pl/.m2/repository/de/dhbwstuttgart/JavaTXcompiler/0.2/JavaTXcompiler-0.2-jar-with-dependencies.jar +[INFO] ------------------------------------------------------------------------ +[INFO] BUILD SUCCESS +[INFO] ------------------------------------------------------------------------ +[INFO] Total time: 23.279 s +[INFO] Finished at: 2019-09-17T09:31:30+02:00 +[INFO] ------------------------------------- + +JavaCompilerCore > cd target + +JavaCompilerCore/target > cp JavaTXcompiler-0.2.jar ../../Plugin_JCC/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/lib/JavaTXcompiler.jar + +Im Eclipse: Plugin_JCC/JavaCompilerPlugin> mvn install + +Plugin_JCC/JavaCompilerPlugin/releng/JavaCompilerPlugin.Update/target > cp JavaCompilerPlugin.Update-0.1.0-SNAPSHOT.zip ~/webdav/public_html/javatx/javatx_XXXXXX.zip + diff --git a/src/test/resources/bytecode/javFiles/Faculty.jav b/src/test/resources/bytecode/javFiles/Faculty.jav index 9d1e6124..14007ece 100644 --- a/src/test/resources/bytecode/javFiles/Faculty.jav +++ b/src/test/resources/bytecode/javFiles/Faculty.jav @@ -3,9 +3,9 @@ import java.lang.Integer; //import java.lang.Short; public class Faculty { - //public fact; - //Faculty() { - public fact = (x) -> { + public fact; + Faculty() { + fact = (x) -> { if (x == 1) { return 1; } @@ -13,6 +13,7 @@ public class Faculty { return x * (fact.apply(x-1)); } }; + } diff --git a/src/test/resources/bytecode/javFiles/OL.jav b/src/test/resources/bytecode/javFiles/OL.jav index ec5f9ab5..01a353fd 100644 --- a/src/test/resources/bytecode/javFiles/OL.jav +++ b/src/test/resources/bytecode/javFiles/OL.jav @@ -2,7 +2,7 @@ import java.lang.String; import java.lang.Integer; import java.lang.Double; import java.lang.Boolean; -import java.util.Vector; +//import java.util.Vector; public class OL { @@ -13,11 +13,11 @@ public class OL { // if the class contains just this method, then correct BC will be generated. // But if another methods are contained then the generated BC is not correct - m(x) { - //x.add(1); - x.addAll(x); - return x; - } +// m(x) { +// //x.add(1); +// x.addAll(x); +// return x; +// } } diff --git a/src/test/resources/bytecode/javFiles/Y.jav b/src/test/resources/bytecode/javFiles/Y.jav index 085bfd3c..a97360d4 100644 --- a/src/test/resources/bytecode/javFiles/Y.jav +++ b/src/test/resources/bytecode/javFiles/Y.jav @@ -8,12 +8,13 @@ class Y { y = f -> t -> f.apply(y.apply(f)).apply(t); //factorial = y.apply(f -> n -> { if (n == 0) return 1; else return n * f.apply(n - 1); }); } - + /* getY() { return y; } + */ } - +/* class fac1 { factorial; @@ -23,7 +24,7 @@ class fac1 { factorial = y.apply(f -> n -> { if (n == 0) return 1; else return n * f.apply(n - 1); }); } } -/* + ergibt Parse-Error class fac1 { factorial; diff --git a/src/test/resources/bytecode/javFiles/mathStruc.jav b/src/test/resources/bytecode/javFiles/mathStruc.jav index 5ee06793..37c5d08c 100644 --- a/src/test/resources/bytecode/javFiles/mathStruc.jav +++ b/src/test/resources/bytecode/javFiles/mathStruc.jav @@ -8,4 +8,3 @@ public class mathStruc { model =m; //innerOp = (o) -> (ms) -> new mathStruc<>(o.apply(this.model,ms.model)); } -} \ No newline at end of file