d

Author: pipermerriam

.gitignore

@@ -112,3 +112,6 @@ htmlcov/**
 
 # CProfile
 prof/**
+
+# Wasm spec submodule
+./spec/**

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "spec"]
+	path = spec
+	url = git@github.com:WebAssembly/spec.git

spec

@@ -8,7 +8,7 @@
 from wasm.exceptions import (
     ParseError,
 )
-from wasm.parsers.blocks import (
+from wasm.parsers.binary.blocks import (
     parse_blocktype,
 )
 

tests/core/parsers/test_blocktype_parser.py

@@ -8,7 +8,7 @@
 )
 import pytest
 
-from wasm.parsers.floats import (
+from wasm.parsers.binary.floats import (
     parse_f32,
     parse_f64,
 )

tests/core/parsers/test_floating_point_parsers.py

@@ -5,7 +5,7 @@
 from wasm.exceptions import (
     MalformedModule,
 )
-from wasm.parsers.integers import (
+from wasm.parsers.binary.integers import (
     parse_i32,
     parse_i64,
     parse_s32,

tests/core/parsers/test_integer_parsers.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from wasm.parsers.leb128 import (
+from wasm.parsers.binary.leb128 import (
     parse_signed_leb128,
     parse_unsigned_leb128,
 )

tests/core/parsers/test_leb128_parsers.py

@@ -8,7 +8,7 @@
 from wasm.opcodes import (
     BinaryOpcode,
 )
-from wasm.parsers.numeric import (
+from wasm.parsers.binary.numeric import (
     parse_numeric_constant_instruction,
 )
 

tests/core/parsers/test_numeric_parsers.py

@@ -0,0 +1,82 @@
+import pytest
+
+
+from wasm.sexpressions import (
+    sexp_parser,
+)
+
+# Test vectors from: http://www.ccp4.ac.uk/dist/checkout/pyparsing-2.0.1/examples/sexpParser.py
+
+test00 = """(snicker "abc" (#03# |YWJj|))"""
+test01 = """(certificate
+ (issuer
+  (name
+   (public-key
+    rsa-with-md5
+    (e 15 |NFGq/E3wh9f4rJIQVXhS|)
+    (n |d738/4ghP9rFZ0gAIYZ5q9y6iskDJwASi5rEQpEQq8ZyMZeIZzIAR2I5iGE=|))
+   aid-committee))
+ (subject
+  (ref
+   (public-key
+    rsa-with-md5
+    (e |NFGq/E3wh9f4rJIQVXhS|)
+    (n |d738/4ghP9rFZ0gAIYZ5q9y6iskDJwASi5rEQpEQq8ZyMZeIZzIAR2I5iGE=|))
+   tom
+   mother))
+ (not-before "1997-01-01_09:00:00")
+ (not-after "1998-01-01_09:00:00")
+ (tag
+  (spend (account "12345678") (* numeric range "1" "1000"))))
+"""
+test02 = """(lambda (x) (* x x))"""
+test03 = """(def length
+   (lambda (x)
+      (cond
+         ((not x) 0)
+         (   t   (+ 1 (length (cdr x))))
+      )
+   )
+)
+"""
+test04 = """(2:XX "abc" (#03# |YWJj|))"""
+test05 = """(if (is (window_name) "XMMS") (set_workspace 2))"""
+test06 = """(if
+  (and
+    (is (application_name) "Firefox")
+    (or
+      (contains (window_name) "Enter name of file to save to")
+      (contains (window_name) "Save As")
+      (contains (window_name) "Save Image")
+      ()
+    )
+  )
+  (geometry "+140+122")
+)
+"""
+test07 = """(defun factorial (x)
+   (if (zerop x) 1
+       (* x (factorial (- x 1)))))
+       """
+test51 = """(2:XX "abc" (#30# |YWJj|))"""
+test51error = """(3:XX "abc" (#30# |YWJj|))"""
+
+test52 = """
+    (and
+      (or (> uid 1000)
+          (!= gid 20)
+      )
+      (> quota 5.0e+03)
+    )
+    """
+
+
+@pytest.mark.parametrize(
+    'value',
+    (
+        test00,
+    ),
+)
+def test_base_sexpression_parser(value):
+    sexp = sexp_parser.parseString(value, parseAll=True)
+    assert sexp

tests/core/sexpressions/test_base_parser.py

@@ -3,6 +3,7 @@
 )
 
 import numpy
+import pytest
 
 from wasm import (
     Runtime,
@@ -43,3 +44,19 @@ def test_json_fixture(fixture_path, pytestconfig):
         instantiate_test_module(runtime.store),
     )
     run_fixture_test(fixture_path, runtime, stop_after_command_line)
+
+
+from wasm.sexpressions import sexp_parser
+
+
+@pytest.fixture
+def submodule_fixture_path():
+    path = Path(__file__).parent.parent.parent / 'spec' / 'tests' / 'core' / 'custom.wast'
+    return path
+
+
+def test_submodule_spec_fixture(submodule_fixture_path):
+    with submodule_fixture_path.open('r') as fixture_file:
+        fixture = sexp_parser.parseFile(fixture_file)
+
+    assert False