Changeset 14002

Timestamp:

07/12/12 09:25:37 (9 years ago)

Author:

Mark Evenson

Message:

dmiles: SYS:*COMPILE-FILE-CLASS-EXTENSION* contains PATHNAME TYPE of compiled JVM artifacts.

The default "cls" of compiled JVM artifacts was chosen to easily
differentiate bewtween JVM artifacts not produced by ABCL and those
which are the JVM bytecode of the ABCL Java 5.0 compiler. During the
bootstrapping and subsequent debugging of the current compiler, this
distinction has proven more useful than giving ABCL produced artifacts
the default "class" CL:PATHNAME TYPE.

This change facilitates the bootstrapping of [running ABCL on the MSFT
.NET CLR underway by dmiles][abcl-ikvm]

[abcl-ikvm]: ​http://code.google.com/r/logicmoo-abcl-ikvm

dmiles: Implementation of ticket #34.

dmiles: It makes no change at first but makes implmentation satisfactory to my
initial request.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• FaslClassLoader.java (modified) (1 diff)
• Lisp.java (modified) (1 diff)
• Load.java (modified) (4 diffs)
• compile-file.lisp (modified) (2 diffs)
• compile-system.lisp (modified) (2 diffs)
• scripting/AbclScriptEngine.java (modified) (2 diffs)

trunk/abcl/src/org/armedbear/lisp/FaslClassLoader.java

@@ -112 +112 @@
 
     public byte[] getFunctionClassBytes(String name) {
-        Pathname pathname = new Pathname(name.substring("org/armedbear/lisp/".length()) + ".cls");
+        Pathname pathname = new Pathname(name.substring("org/armedbear/lisp/".length()) + "." + Lisp._COMPILE_FILE_CLASS_EXTENSION_.symbolValue().getStringValue());
         return readFunctionBytes(pathname);
     }

trunk/abcl/src/org/armedbear/lisp/Lisp.java

@@ -2483 +2483 @@
 
   // ### *compile-file-type*
-  public static final String COMPILE_FILE_TYPE = "abcl";
   public static final Symbol _COMPILE_FILE_TYPE_ =
-    internConstant("*COMPILE-FILE-TYPE*", PACKAGE_SYS,
-                   new SimpleString(COMPILE_FILE_TYPE));
+   exportSpecial("*COMPILE-FILE-TYPE*", PACKAGE_SYS, new SimpleString("abcl"));    
+  
+  // ### *compile-file-class-extension*
+  public static final Symbol _COMPILE_FILE_CLASS_EXTENSION_ =
+   exportSpecial("*COMPILE-FILE-CLASS-EXTENSION*", PACKAGE_SYS, new SimpleString("cls"));
 
   // ### *compile-file-zip*

trunk/abcl/src/org/armedbear/lisp/Load.java

@@ -74 +74 @@
             }
         }
+        final String COMPILE_FILE_TYPE = Lisp._COMPILE_FILE_TYPE_.symbolValue().getStringValue();
         if (name.type == NIL
             && (name.name != NIL || name.name != null)) {
@@ -81 +82 @@
             LispObject lisp = Pathname.truename(lispPathname, false);
             Pathname abclPathname = new Pathname(name);
-            abclPathname.type = new SimpleString("abcl");
+            abclPathname.type = new SimpleString(COMPILE_FILE_TYPE);
             abclPathname.invalidateNamestring();
             LispObject abcl = Pathname.truename(abclPathname, false);
@@ -263 +264 @@
         URL url = null;
         truename = findLoadableFile(mergedPathname);
+        final String COMPILE_FILE_TYPE = Lisp._COMPILE_FILE_TYPE_.symbolValue().getStringValue();
         if (truename == null || truename.equals(NIL) || bootPath.equals(NIL)) {
             // Make an attempt to use the boot classpath
             String path = pathname.asEntryPath();
-            url = Lisp.class.getResource(path);
+            url = Lisp.class.getResource(path);            
             if (url == null || url.toString().endsWith("/")) {
-                url = Lisp.class.getResource(path.replace('-', '_') + ".abcl");
+                url = Lisp.class.getResource(path.replace('-', '_') + "." + COMPILE_FILE_TYPE);
                 if (url == null) {
                     url = Lisp.class.getResource(path + ".lisp");
@@ -477 +479 @@
                 truePathname = new Pathname(((Pathname)truename).getNamestring());
                 String type = truePathname.type.getStringValue();
-                if (type.equals(COMPILE_FILE_TYPE)
+                if (type.equals(Lisp._COMPILE_FILE_TYPE_.symbolValue(thread).getStringValue())
                     || type.equals(COMPILE_FILE_INIT_FASL_TYPE.toString())) {
                     Pathname truenameFasl = new Pathname(truePathname);

trunk/abcl/src/org/armedbear/lisp/compile-file.lisp

@@ -54 +54 @@
          (sanitize-class-name
     (%format nil "~A_~D" (pathname-name output-file-pathname) n))))
-    (namestring (merge-pathnames (make-pathname :name name :type "cls")
+    (namestring (merge-pathnames (make-pathname :name name :type *compile-file-class-extension*)
                                  output-file-pathname))))
 
@@ -617 +617 @@
          (fasl-loader (namestring (merge-pathnames
                                    (make-pathname :name (fasl-loader-classname)
-                                                  :type "cls")
+                                                  :type *compile-file-class-extension*)
                                    output-file))))
     (when (probe-file fasl-loader)

trunk/abcl/src/org/armedbear/lisp/compile-system.lisp

@@ -87 +87 @@
       (setf output-path *default-pathname-defaults*))
     (flet ((do-compile (file)
-             (let ((out (make-pathname :type "abcl"
+             (let ((out (make-pathname :type *compile-file-type*
                                        :defaults (merge-pathnames
                                                   file output-path))))
@@ -274 +274 @@
     t))
 
-(defun compile-system (&key quit (zip t) output-path)
-  (let ((status -1))
+(defun compile-system (&key quit (zip t) (cls-ext *compile-file-class-extension*) (abcl-ext *compile-file-type*) output-path)
+  (let ((status -1)
+  (*compile-file-class-extension* cls-ext)
+  (*compile-file-type* abcl-ext))
     (check-lisp-home)
     (time

trunk/abcl/src/org/armedbear/lisp/scripting/AbclScriptEngine.java

@@ -137 +137 @@
 
   public static boolean isCompiled(String filespec) {
-    if (filespec.endsWith(".abcl")) {
+    final String compiledExt = "." + Lisp._COMPILE_FILE_TYPE_.symbolValue().getStringValue();
+    if (filespec.endsWith(compiledExt)) {
       return true;
     }
@@ -145 +146 @@
       source = new File(filespec);
       compiled = new File(filespec.substring(0, filespec.length() - 5)
-          + ".abcl");
+          + compiledExt);
     } else {
       source = new File(filespec + ".lisp");
-      compiled = new File(filespec + ".abcl");
+      compiled = new File(filespec + compiledExt);
     }
     if (!source.exists()) {