From d01f997a4dc9e9aead97f38c57ad4fc6a0041b0a Mon Sep 17 00:00:00 2001 From: Thomas Walker Lynch Date: Fri, 20 Dec 2024 03:59:33 +0000 Subject: [PATCH] tests passing --- .../Mosaic_Dispatcher.java" | 23 ++++--------------- .../tool\360\237\226\211/clean" | 0 .../javac\360\237\226\211/Dispatcher_1.java" | 10 ++++---- .../javac\360\237\226\211/Dispatcher_2.java" | 16 ++++++------- .../tool\360\237\226\211/clean" | 0 5 files changed, 18 insertions(+), 31 deletions(-) rename "developer/tool\360\237\226\211/clean_build_directories" => "developer/tool\360\237\226\211/clean" (100%) rename "tester/tool\360\237\226\211/clean_build_directories" => "tester/tool\360\237\226\211/clean" (100%) diff --git "a/developer/javac\360\237\226\211/Mosaic_Dispatcher.java" "b/developer/javac\360\237\226\211/Mosaic_Dispatcher.java" index 8cc567b..543386d 100644 --- "a/developer/javac\360\237\226\211/Mosaic_Dispatcher.java" +++ "b/developer/javac\360\237\226\211/Mosaic_Dispatcher.java" @@ -230,23 +230,6 @@ class MethodSignature_To_Handle_Map{ MethodType method_type=MethodType.methodType(method.getReturnType(),parameter_type_list); MethodHandle method_handle; - /* throws access exception due to public methods of private classes going down the public method branch - if((method.getModifiers() & Modifier.STATIC) != 0){ - if((method.getModifiers() & Modifier.PRIVATE) != 0){ - // Private static method - method_handle = private_lookup.findStatic(class_metadata, method.getName(), method_type); - }else{ - // Public or protected static method - method_handle = lookup.findStatic(class_metadata, method.getName(), method_type); - } - }else if((method.getModifiers() & Modifier.PRIVATE) != 0){ - // Private instance method - method_handle = private_lookup.findSpecial(class_metadata, method.getName(), method_type, class_metadata); - }else{ - // Public or protected instance method - method_handle = lookup.findVirtual(class_metadata, method.getName(), method_type); - } - */ if((method.getModifiers() & Modifier.STATIC) != 0){ method_handle = private_lookup.findStatic(class_metadata, method.getName(), method_type); }else{ @@ -256,7 +239,11 @@ class MethodSignature_To_Handle_Map{ add_entry(signature,method_handle); }catch(IllegalAccessException|NoSuchMethodException e){ - System.err.println("Mosaic_Dispatcher::add_methods unexpectedly failed to register method: "+method.getName()); + System.err.println + ( + "Mosaic_Dispatcher::add_methods unexpectedly failed to register method: " + + method.getName() + " in class: " + class_metadata.getName() + ); e.printStackTrace(); } } diff --git "a/developer/tool\360\237\226\211/clean_build_directories" "b/developer/tool\360\237\226\211/clean" similarity index 100% rename from "developer/tool\360\237\226\211/clean_build_directories" rename to "developer/tool\360\237\226\211/clean" diff --git "a/tester/javac\360\237\226\211/Dispatcher_1.java" "b/tester/javac\360\237\226\211/Dispatcher_1.java" index 89da82f..8bd7462 100644 --- "a/tester/javac\360\237\226\211/Dispatcher_1.java" +++ "b/tester/javac\360\237\226\211/Dispatcher_1.java" @@ -52,7 +52,7 @@ public class Dispatcher_1{ System.out.println(""); System.out.println("running test: publicMethod_1"); if(Boolean.TRUE.equals(test_publicMethod_1())){ - System.out.println("PASSED"); + System.out.println("passed"); }else{ System.out.println("FAILED"); result = false; @@ -61,7 +61,7 @@ public class Dispatcher_1{ System.out.println(""); System.out.println("running test: privateMethod_2"); if(Boolean.TRUE.equals(test_privateMethod_2())){ - System.out.println("PASSED"); + System.out.println("passed"); }else{ System.out.println("FAILED"); result = false; @@ -70,7 +70,7 @@ public class Dispatcher_1{ System.out.println(""); System.out.println("running test: nestedPublicMethod_3"); if(Boolean.TRUE.equals(test_nestedPublicMethod_3())){ - System.out.println("PASSED"); + System.out.println("passed"); }else{ System.out.println("FAILED"); result = false; @@ -79,7 +79,7 @@ public class Dispatcher_1{ System.out.println(""); System.out.println("running test: nestedPrivateMethod_4"); if(Boolean.TRUE.equals(test_nestedPrivateMethod_4())){ - System.out.println("PASSED"); + System.out.println("passed"); }else{ System.out.println("FAILED"); result = false; @@ -96,7 +96,7 @@ public class Dispatcher_1{ } private static boolean logPass(){ - System.out.println("PASSED"); + System.out.println("passed"); return true; } diff --git "a/tester/javac\360\237\226\211/Dispatcher_2.java" "b/tester/javac\360\237\226\211/Dispatcher_2.java" index caf8672..5384d03 100644 --- "a/tester/javac\360\237\226\211/Dispatcher_2.java" +++ "b/tester/javac\360\237\226\211/Dispatcher_2.java" @@ -109,7 +109,7 @@ public class Dispatcher_2{ System.out.println(""); System.out.println("running test: publicStaticField"); if(Boolean.TRUE.equals(test_publicStaticField())){ - System.out.println("PASSED"); + System.out.println("passed"); }else{ System.out.println("FAILED"); result=false; @@ -118,7 +118,7 @@ public class Dispatcher_2{ System.out.println(""); System.out.println("running test: privateStaticField"); if(Boolean.TRUE.equals(test_privateStaticField())){ - System.out.println("PASSED"); + System.out.println("passed"); }else{ System.out.println("FAILED"); result=false; @@ -127,7 +127,7 @@ public class Dispatcher_2{ System.out.println(""); System.out.println("running test: publicInstanceField"); if(Boolean.TRUE.equals(test_publicInstanceField())){ - System.out.println("PASSED"); + System.out.println("passed"); }else{ System.out.println("FAILED"); result=false; @@ -136,7 +136,7 @@ public class Dispatcher_2{ System.out.println(""); System.out.println("running test: privateInstanceField"); if(Boolean.TRUE.equals(test_privateInstanceField())){ - System.out.println("PASSED"); + System.out.println("passed"); }else{ System.out.println("FAILED"); result=false; @@ -146,7 +146,7 @@ public class Dispatcher_2{ System.out.println(""); System.out.println("running test: writePublicStaticField"); if(Boolean.TRUE.equals(test_writePublicStaticField())){ - System.out.println("PASSED"); + System.out.println("passed"); }else{ System.out.println("FAILED"); result=false; @@ -155,7 +155,7 @@ public class Dispatcher_2{ System.out.println(""); System.out.println("running test: writePrivateStaticField"); if(Boolean.TRUE.equals(test_writePrivateStaticField())){ - System.out.println("PASSED"); + System.out.println("passed"); }else{ System.out.println("FAILED"); result=false; @@ -164,7 +164,7 @@ public class Dispatcher_2{ System.out.println(""); System.out.println("running test: writePublicInstanceField"); if(Boolean.TRUE.equals(test_writePublicInstanceField())){ - System.out.println("PASSED"); + System.out.println("passed"); }else{ System.out.println("FAILED"); result=false; @@ -173,7 +173,7 @@ public class Dispatcher_2{ System.out.println(""); System.out.println("running test: writePrivateInstanceField"); if(Boolean.TRUE.equals(test_writePrivateInstanceField())){ - System.out.println("PASSED"); + System.out.println("passed"); }else{ System.out.println("FAILED"); result=false; diff --git "a/tester/tool\360\237\226\211/clean_build_directories" "b/tester/tool\360\237\226\211/clean" similarity index 100% rename from "tester/tool\360\237\226\211/clean_build_directories" rename to "tester/tool\360\237\226\211/clean" -- 2.20.1