steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

db4
Björn Lindqvist 2013-08-25 17:26:06 +02:00 committed by Doug Coleman
parent 090f4fddd5
commit 990af22dc6
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/alien/strings/strings.factor
View File

@ -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

4
core/kernel/kernel.factor
View File

@ -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

6
core/system/system.factor
View File

@ -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 ;

4
vm/factor.cpp
View File

@ -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 */

4
vm/objects.hpp
View File

@ -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