[armedbear-cvs] r14064 - trunk/abcl/src/org/armedbear/lisp

[rschlatte at common-lisp.net]

Author: rschlatte
Date: Tue Aug  7 09:50:15 2012
New Revision: 14064

Log:
Cosmetic changes

- rename local variables
- directly set initial value of *features*

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

Modified: trunk/abcl/src/org/armedbear/lisp/Lisp.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Lisp.java	Tue Aug  7 03:36:33 2012	(r14063)
+++ trunk/abcl/src/org/armedbear/lisp/Lisp.java	Tue Aug  7 09:50:15 2012	(r14064)
@@ -2324,8 +2324,8 @@
   static
   {
     final String osName = System.getProperty("os.name");
-    final String version = System.getProperty("java.version");
-    final String os_arch = System.getProperty("os.arch");
+    final String javaVersion = System.getProperty("java.version");
+    final String osArch = System.getProperty("os.arch");
 
     // Common features
     LispObject featureList = list(Keyword.ARMEDBEAR, Keyword.ABCL,
@@ -2361,22 +2361,21 @@
     else if (osName.startsWith("Windows"))
       featureList = new Cons(Keyword.WINDOWS, featureList);
     // Java version
-    if (version.startsWith("1.5")) {
+    if (javaVersion.startsWith("1.5")) {
         featureList = new Cons(Keyword.JAVA_1_5, featureList);
-    } else if (version.startsWith("1.6")) {
+    } else if (javaVersion.startsWith("1.6")) {
         featureList = new Cons(Keyword.JAVA_1_6, featureList);
-    } else if (version.startsWith("1.7")) {
+    } else if (javaVersion.startsWith("1.7")) {
         featureList = new Cons(Keyword.JAVA_1_7, featureList);
     }
     // Processor architecture
-    if(os_arch != null) {
-      if (os_arch.equals("amd64"))
+    if(osArch != null) {
+      if (osArch.equals("amd64"))
         featureList = new Cons(Keyword.X86_64, featureList);
-      else if (os_arch.equals("x86"))
+      else if (osArch.equals("x86"))
         featureList = new Cons(Keyword.X86, featureList);
     }
-    Symbol.FEATURES.initializeSpecial(NIL);
-    Symbol.FEATURES.setSymbolValue(featureList);
+    Symbol.FEATURES.initializeSpecial(featureList);
   }
 
   static