Merge 01178ac into 14708a4

Author: Beakerboy

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vba_precompiler"
-version = "0.0.1"
+version = "0.0.2"
 authors = [
   { name="Kevin Nowaczyk", email="beakerboy99@yahoo.com" },
 ]
@@ -21,6 +21,7 @@ dependencies = [
   'antlr4-tools',
   'antlr4_vba',
   'python-dateutil',
+  'vba-stdlib @ git+https://github.com/Beakerboy/vbaStdLib@dev'
 ]
 [project.optional-dependencies]
 tests = [

src/vba_precompiler/__main__.py

@@ -1,5 +1,6 @@
 import argparse
 import sys
+from vba_stdlib.literal_factory import literal_from_string
 from pathlib import Path
 from vba_precompiler.compiler import Compiler
 
@@ -8,6 +9,8 @@ def main() -> None:
     parser = argparse.ArgumentParser()
     parser.add_argument("-s", "--system", default="Win16",
                         help="Mac, Win16, Win32, or Win64")
+    parser.add_argument("-D", "--define", default="",
+                        help="Define an enviromnet variable")
     parser.add_argument("-v", "--version", default="6",
                         help="VBA version, 6 or 7")
     parser.add_argument("-o", "--output", default="./build",
@@ -41,9 +44,17 @@ def main() -> None:
         vba7 = True
     else:
         raise Exception("VBA Version Unsupported: " + args.version)
-
     env = {"WIN16": win16, "WIN32": win32, "WIN64": win64,
            "MAC": mac, "VBA6": vba6, "VBA7": vba7, "MAC_OFFICE_VERSION": 0}
+    if args.define != "":
+        params = args.define.split(',')
+        for name_value in params:
+            pair = name_value.split("=")
+            key = pair[0].upper()
+            value = pair[1]
+            if value[-1:1] == '""':
+                value = value[1:-1]
+            env[key] = literal_from_string(value)
     compiler = Compiler(env)
     Path(args.output).mkdir(parents=True, exist_ok=True)
     num_errors = 0

src/vba_precompiler/compiler.py

@@ -11,8 +11,8 @@
 
 class Compiler:
     # class default constructor
-    def __init__(self: T, environment: dict) -> None:
-        self.environment = environment
+    def __init__(self: T, env: dict) -> None:
+        self.environment = env
 
     def compile(self: T, path: str) -> str:
         if Path(path).exists():

tests/Functional/test_main.py

@@ -341,6 +341,30 @@ def test_date_literal(mocker: MockerFixture) -> None:
     assert_files_identical(expected_output_file, target_output)
 
 
+def test_define(mocker: MockerFixture) -> None:
+    """
+    Test that an the arithmetic operators work as expected.
+    """
+    input_path = "tests/files/project17"
+    file_name = "define.bas"
+    args = ["IntTest=42", "FloatTest=3.1415926535",
+            "BoolTest=True", 'StringTest="Yes"',
+            "DateTest=#Jan/1/1999#"]
+    arg_string = ",".join(args)
+    mocker.patch(
+        "sys.argv",
+        [
+            "vba_precompiler.py",
+            '-D' + arg_string,
+            input_path,
+        ],
+    )
+    main()
+    expected_output_file = "./build/" + file_name
+    target_output = "./tests/files/build/" + file_name
+    assert_files_identical(expected_output_file, target_output)
+
+
 def assert_files_identical(new_file: str, target_output: str) -> bool:
     # if they are the same, just make the assertion
     # if not, raise an exception with details.

tests/files/build/define.bas

@@ -0,0 +1,16 @@
+Attribute VB_Name = "Define"
+'#if StringTest = "Yes"
+    foo = 1
+'#endif
+'#if IntTest = 42
+    foo = 1
+'#endif
+'#if BoolTest = True
+    foo = 1
+'#endif
+'#if FloatTest = 3.1415926535
+    foo = 1
+'#endif
+'#if DateTest = #01 Jan 1999#
+    foo = 1
+'#endif

tests/files/project17/define.bas

@@ -0,0 +1,16 @@
+Attribute VB_Name = "Define"
+#if StringTest = "Yes"
+    foo = 1
+#endif
+#if IntTest = 42
+    foo = 1
+#endif
+#if BoolTest = True
+    foo = 1
+#endif
+#if FloatTest = 3.1415926535
+    foo = 1
+#endif
+#if DateTest = #01 Jan 1999#
+    foo = 1
+#endif