Changeset 14064

Timestamp:

08/07/12 16:50:15 (9 years ago)

Author:

rschlatte

Message:

Cosmetic changes

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

File:

• trunk/abcl/src/org/armedbear/lisp/Lisp.java (modified) (2 diffs)

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

@@ -2325 +2325 @@
   {
     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
@@ -2362 +2362 @@
       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);
   }