VM: renamed version and git-label to vm-version and vm-git-label.

diff --git a/core/alien/strings/strings.factor b/core/alien/strings/strings.factor
index 63ea05bb1cab7216de010c885e349980fb394b77..e45c6c1958141892cb6b0b66aee726116ac8707b 100644 (file)
--- a/core/alien/strings/strings.factor
+++ b/core/alien/strings/strings.factor
@@ -94,8 +94,8 @@ M: array symbol>string [ (symbol>string) ] map ", " join ;
 [
     OBJ-CPU special-object>string string>cpu \ cpu set-global
     OBJ-OS special-object>string string>os \ os set-global
-    OBJ-VERSION special-object>string \ version set-global
-    OBJ-GIT-LABEL special-object>string \ git-label set-global
+    OBJ-VM-VERSION special-object>string \ vm-version set-global
+    OBJ-VM-GIT-LABEL special-object>string \ vm-git-label set-global
     OBJ-VM-COMPILER special-object>string \ vm-compiler set-global
     OBJ-VM-COMPILE-TIME special-object>string \ vm-compile-time set-global
 ] "alien.strings" add-startup-hook

diff --git a/core/kernel/kernel.factor b/core/kernel/kernel.factor
index 9eecbb2a027e43ba76d612100832fc88e661dede..f7ac28dec7a029ebdfc1668edb828376702b0576 100644 (file)
--- a/core/kernel/kernel.factor
+++ b/core/kernel/kernel.factor
@@ -354,8 +354,8 @@ CONSTANT: OBJ-SIGNAL-PIPE 74
 
 CONSTANT: OBJ-VM-COMPILE-TIME 75
 
-CONSTANT: OBJ-VERSION 76
-CONSTANT: OBJ-GIT-LABEL 77
+CONSTANT: OBJ-VM-VERSION 76
+CONSTANT: OBJ-VM-GIT-LABEL 77
 
 ! Context object count and identifiers must be kept in sync with:
 !   vm/contexts.hpp

diff --git a/core/system/system.factor b/core/system/system.factor
index f59bf7ff5533261cf65ae49a7750d0ca12f53864..9aca2d33c6e82cd9fb236969676c6bd2ac1959cc 100644 (file)
--- a/core/system/system.factor
+++ b/core/system/system.factor
@@ -16,9 +16,9 @@ UNION: unix macosx linux ;
 
 : os ( -- class ) \ os get-global ; foldable
 
-: version ( -- string ) \ version get-global ; foldable
+: vm-version ( -- string ) \ vm-version get-global ; foldable
 
-: git-label ( -- string ) \ git-label get-global ; foldable
+: vm-git-label ( -- string ) \ vm-git-label get-global ; foldable
 
 : vm-compiler ( -- string ) \ vm-compiler get-global ; foldable
 
@@ -67,6 +67,6 @@ PRIVATE>
 
 : version-info ( -- str )
     ! formatting vocab not available in this context.
-    "Factor " version append " (" append git-label append ", " append
+    "Factor " vm-version append " (" append vm-git-label append ", " append
     vm-compile-time append ") [" append vm-compiler append
     " " append cpu cpu>string append "] on " append os os>string append ;

diff --git a/vm/factor.cpp b/vm/factor.cpp
index 4cab92ea3d9b7561059aca350c351d91edd4d0a0..52985a0a52a93e61ee01d16f6936d85dcab3e663 100644 (file)
--- a/vm/factor.cpp
+++ b/vm/factor.cpp
@@ -154,9 +154,9 @@ void factor_vm::init_factor(vm_parameters* p) {
       allot_alien(false_object, (cell)FACTOR_COMPILER_VERSION);
   special_objects[OBJ_VM_COMPILE_TIME] =
       allot_alien(false_object, (cell)FACTOR_COMPILE_TIME);
-  special_objects[OBJ_VERSION] =
+  special_objects[OBJ_VM_VERSION] =
       allot_alien(false_object, (cell)FACTOR_STRINGIZE(FACTOR_VERSION));
-  special_objects[OBJ_GIT_LABEL] =
+  special_objects[OBJ_VM_GIT_LABEL] =
       allot_alien(false_object, (cell)FACTOR_STRINGIZE(FACTOR_GIT_LABEL));
 
   /* We can GC now */

diff --git a/vm/objects.hpp b/vm/objects.hpp
index 11950b5faa5e55a5ad1175afe8fcbd517548d9b5..a5994acd5cd3e666fa89ee4a03b19252e4839ecf 100644 (file)
--- a/vm/objects.hpp
+++ b/vm/objects.hpp
@@ -107,8 +107,8 @@ enum special_object {
   OBJ_SIGNAL_PIPE = 74, /* file descriptor for pipe used to communicate signals
                            only used on unix */
   OBJ_VM_COMPILE_TIME = 75, /* when the binary was built */
-  OBJ_VERSION = 76, /* factor version */
-  OBJ_GIT_LABEL = 77, /* git label (git describe --all --long) */
+  OBJ_VM_VERSION = 76, /* factor version */
+  OBJ_VM_GIT_LABEL = 77, /* git label (git describe --all --long) */
 };
 
 /* save-image-and-exit discards special objects that are filled in on startup