[[ Bug 20705 ]] Add 'the architecture' syntax to LCB

livecodeali · livecodeali · commit 38b024f37996 · 2017-12-15T10:23:57.000Z
diff --git a/docs/lcb/notes/20705.md b/docs/lcb/notes/20705.md
@@ -0,0 +1,5 @@
+# LiveCode Builder Standard Library
+
+## System module
+
+# [20705] Add 'the architecture' syntax
diff --git a/libscript/src/module-system.cpp b/libscript/src/module-system.cpp
@@ -46,6 +46,28 @@ MCSystemExecGetOperatingSystem (MCStringRef & r_string)
 	/* UNCHECKED */ MCStringCreateWithCString (t_os, r_string);
 }
 
+extern "C" MC_DLLEXPORT_DEF void
+MCSystemExecGetArchitecture(MCStringRef & r_string)
+{
+    const char t_arch[] =
+#if defined(__X86__) || defined(__i386__)
+    "x86"
+#elif defined(__X86_64__)
+    "x86_64"
+#elif defined(__ARM64__)
+    "arm64"
+#elif defined(__ARM__)
+    "arm"
+#elif defined(__EMSCRIPTEN__)
+    "js"
+#else
+#  error "Unrecognized architecture"
+#endif
+    ;
+    
+    /* UNCHECKED */ MCStringCreateWithCString (t_arch, r_string);
+}
+
 /* ================================================================
  * Command-line information
  * ================================================================ */
diff --git a/libscript/src/system.lcb b/libscript/src/system.lcb
@@ -56,6 +56,34 @@ begin
 	MCSystemExecGetOperatingSystem(output)
 end syntax
 
+public foreign handler MCSystemExecGetArchitecture(out Architecture as String) returns nothing binds to "<builtin>"
+/**
+Summary:    The architecture
+
+Example:
+    if the architecture is "x86_64" then
+        -- Do something x86_64 specific
+    end if
+
+Description:
+Returns a string describing the instruction set architecture
+that is being used by the machine LiveCode is running on.
+The possible values are:
+
+* "x86" - 32-bit x86 builds
+* "x86_64" - 64-bit x86 builds
+* "arm" - 32-bit arm builds
+* "arm64" - 64-bit arm builds
+* "js" - Emscripten
+
+Tags: System
+*/
+syntax Architecture is expression
+    "the" "architecture"
+begin
+    MCSystemExecGetArchitecture(output)
+end syntax
+
 ----------------------------------------------------------------
 -- Exit / Quit
 ----------------------------------------------------------------
diff --git a/tests/lcb/stdlib/system.lcb b/tests/lcb/stdlib/system.lcb
@@ -0,0 +1,29 @@
+/*
+Copyright (C) 2017 LiveCode Ltd.
+
+This file is part of LiveCode.
+
+LiveCode is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License v3 as published by the Free
+Software Foundation.
+
+LiveCode is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
+
+module com.livecode.system.tests
+
+use com.livecode.system
+use com.livecode.__INTERNAL._testlib
+
+constant kValidArchs is ["x86", "x86_64", "arm", "arm64", "js"]
+public handler TestArchitecture()
+	test "architecture is valid" when \
+		the architecture is in kValidArchs
+end handler
+
+end module
