tests passing
authorThomas Walker Lynch <eknp9n@reasoningtechnology.com>
Fri, 20 Dec 2024 03:59:33 +0000 (03:59 +0000)
committerThomas Walker Lynch <eknp9n@reasoningtechnology.com>
Fri, 20 Dec 2024 03:59:33 +0000 (03:59 +0000)
developer/javac🖉/Mosaic_Dispatcher.java
developer/tool🖉/clean [new file with mode: 0755]
developer/tool🖉/clean_build_directories [deleted file]
tester/javac🖉/Dispatcher_1.java
tester/javac🖉/Dispatcher_2.java
tester/tool🖉/clean [new file with mode: 0755]
tester/tool🖉/clean_build_directories [deleted file]

index 8cc567b..543386d 100644 (file)
@@ -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🖉/clean b/developer/tool🖉/clean
new file mode 100755 (executable)
index 0000000..a32578f
--- /dev/null
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+script_afp=$(realpath "${BASH_SOURCE[0]}")
+
+# Removes all files found in the build directories. It asks no questions as to
+# how or why the files got there. Be especially careful with the 'bash'
+# directory if you have authored scripts for release, add a `bash🖉`
+# directory instead of putting them in `bash`.
+
+# input guards
+  env_must_be="developer/tool🖉/env"
+  if [ "$ENV" != "$env_must_be" ]; then
+    echo "$(script_fp):: error: must be run in the $env_must_be environment"
+    exit 1
+  fi
+
+# remove files
+  set -x
+  cd "$REPO_HOME"/developer
+
+  # rm_na currently does not handle links correctly 
+  rm -r scratchpad/*
+
+  rm_na jvm/*
+  rm_na bash/*
+  set +x
+
+echo "$(script_fn) done."
+
diff --git a/developer/tool🖉/clean_build_directories b/developer/tool🖉/clean_build_directories
deleted file mode 100755 (executable)
index a32578f..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-script_afp=$(realpath "${BASH_SOURCE[0]}")
-
-# Removes all files found in the build directories. It asks no questions as to
-# how or why the files got there. Be especially careful with the 'bash'
-# directory if you have authored scripts for release, add a `bash🖉`
-# directory instead of putting them in `bash`.
-
-# input guards
-  env_must_be="developer/tool🖉/env"
-  if [ "$ENV" != "$env_must_be" ]; then
-    echo "$(script_fp):: error: must be run in the $env_must_be environment"
-    exit 1
-  fi
-
-# remove files
-  set -x
-  cd "$REPO_HOME"/developer
-
-  # rm_na currently does not handle links correctly 
-  rm -r scratchpad/*
-
-  rm_na jvm/*
-  rm_na bash/*
-  set +x
-
-echo "$(script_fn) done."
-
index 89da82f..8bd7462 100644 (file)
@@ -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;
   }
 
index caf8672..5384d03 100644 (file)
@@ -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🖉/clean b/tester/tool🖉/clean
new file mode 100755 (executable)
index 0000000..989b007
--- /dev/null
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+script_afp=$(realpath "${BASH_SOURCE[0]}")
+
+# input guards
+  env_must_be="tester/tool🖉/env"
+  if [ "$ENV" != "$env_must_be" ]; then
+    echo "$(script_fp):: error: must be run in the $env_must_be environment"
+    exit 1
+  fi
+
+# remove files
+  set -x
+  cd "$REPO_HOME"/tester
+  rm_na log/log.txt
+  rm_na -r scratchpad/*
+  rm_na jvm/*
+  rm_na jdwp_server/*
+  set +x
+
+echo "$(script_fn) done."
diff --git a/tester/tool🖉/clean_build_directories b/tester/tool🖉/clean_build_directories
deleted file mode 100755 (executable)
index 989b007..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-script_afp=$(realpath "${BASH_SOURCE[0]}")
-
-# input guards
-  env_must_be="tester/tool🖉/env"
-  if [ "$ENV" != "$env_must_be" ]; then
-    echo "$(script_fp):: error: must be run in the $env_must_be environment"
-    exit 1
-  fi
-
-# remove files
-  set -x
-  cd "$REPO_HOME"/tester
-  rm_na log/log.txt
-  rm_na -r scratchpad/*
-  rm_na jvm/*
-  rm_na jdwp_server/*
-  set +x
-
-echo "$(script_fn) done."