From e01c57628e0d06392cd386fa846d07867f9f8151 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Wed, 2 Nov 2016 07:34:38 -0700
Subject: [PATCH] Revert "alien.strings: change how string>{cpu,os} works."

This reverts commit 84fe3deff8e2b454c3dc936515597c1335590ea4.

Probably doesn't work with deployed images that have stripped
word names, where name>> would return f.
---
 core/alien/strings/strings.factor | 10 ----------
 core/system/system.factor         | 24 ++++++++++++++++++++++++
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/core/alien/strings/strings.factor b/core/alien/strings/strings.factor
index d59a56e8f6..b5d92e02a0 100644
--- a/core/alien/strings/strings.factor
+++ b/core/alien/strings/strings.factor
@@ -87,19 +87,9 @@ M: byte-array symbol>string utf8 alien>string ;
 
 M: array symbol>string [ utf8 alien>string ] map ", " join ;
 
-<PRIVATE
-
 : special-object>string ( n -- str )
     special-object utf8 alien>string ;
 
-: string>cpu ( str -- cpu )
-    { x86.32 x86.64 arm ppc.32 ppc.64 } [ name>> = ] with find nip ;
-
-: string>os ( str -- os )
-    { windows macosx linux } [ name>> = ] with find nip ;
-
-PRIVATE>
-
 [
     OBJ-CPU special-object>string string>cpu \ cpu set-global
     OBJ-OS special-object>string string>os \ os set-global
diff --git a/core/system/system.factor b/core/system/system.factor
index 2803b3f9bd..99628b2b69 100644
--- a/core/system/system.factor
+++ b/core/system/system.factor
@@ -36,6 +36,30 @@ UNION: unix macosx linux ;
 
 : vm-compile-time ( -- string ) \ vm-compile-time get-global ;
 
+<PRIVATE
+
+CONSTANT: string>cpu-hash H{
+    { "x86.32" x86.32 }
+    { "x86.64" x86.64 }
+    { "arm" arm }
+    { "ppc.32" ppc.32 }
+    { "ppc.64" ppc.64 }
+}
+
+CONSTANT: string>os-hash H{
+    { "windows" windows }
+    { "macosx" macosx }
+    { "linux" linux }
+}
+
+: string>cpu ( str -- class )
+    string>cpu-hash at ;
+
+: string>os ( str -- class )
+    string>os-hash at ;
+
+PRIVATE>
+
 : image-path ( -- path ) \ image-path get-global ;
 
 : vm-path ( -- path ) \ vm-path get-global ;