Introduce basic methodmaps (PR #38).

commit 1e5213d43fdd170bb0c30af914a4e40610014b2b Author: David Anderson <[email protected]> Date: Sat Jun 21 04:09:27 2014 -0700 Quell MSVC C99 bugs. commit f2e166c5925fda49b5abeadc0aa0f9156b99cf11 Author: David Anderson <[email protected]> Date: Sat Jun 21 03:59:23 2014 -0700 Fix varying levels of stupid memory errors. commit b0773d7be45345351ab1c1738681d5215a97f3f3 Author: David Anderson <[email protected]> Date: Sat Jun 21 03:36:39 2014 -0700 Fix memory leak in parsing some control flow structures. commit 5aca55713cfc2dd09c5900132fc4a6be51e3e309 Author: David Anderson <[email protected]> Date: Sat Jun 21 03:35:17 2014 -0700 Fix memory leak in struct parsing. commit b46ec5cd281b46177e83c4f0a4acac9cc1065c53 Author: David Anderson <[email protected]> Date: Sat Jun 21 03:32:03 2014 -0700 Fix build. commit 17bbbb9a46bfc00862adca7d3e15369a48e9ac0f Merge: c083409 2107599 Author: David Anderson <[email protected]> Date: Sat Jun 21 01:26:27 2014 -0700 Merge branch 'master' into methodmaps commit c083409b569abff13f24d3b8c47f8ff199036840 Author: David Anderson <[email protected]> Date: Fri Jun 20 23:49:36 2014 -0700 Add VS2k13 support. commit b7993778494d538cb1c1965116030142a7f7765b Author: David Anderson <[email protected]> Date: Fri Jun 20 01:28:08 2014 -0700 Implement destructors. commit 1a340dec260d079ed1b79351ed7b50b58a997cea Author: David Anderson <[email protected]> Date: Fri Jun 20 00:08:04 2014 -0700 Add some tests. commit 12db52ee64eb009ead9294495e9034c63ab75b09 Author: David Anderson <[email protected]> Date: Fri Jun 20 00:05:49 2014 -0700 Initial implementation of constructors. commit 074669a658caa2822aa864164b615a244c00a0bc Author: David Anderson <[email protected]> Date: Thu Jun 19 22:42:35 2014 -0700 Add simple test harness. commit 27c1e3cf14e1e6c5cf35c80c792cce2744b804d7 Author: David Anderson <[email protected]> Date: Thu Jun 19 22:15:42 2014 -0700 Big refactoring for new syntax. commit f3c37fdc919e76ee0815e2394cbe8d221f9fc0ca Author: David Anderson <[email protected]> Date: Thu Jun 19 22:12:54 2014 -0700 Refactor tests for the new syntax. commit 6211f392f8e722b907474cf380cfac4347e46b8e Author: David Anderson <[email protected]> Date: Wed Jun 18 22:25:48 2014 -0700 Make lexer tokens an enum. commit 5210b013756b0b00de3a61c6490685c768ff8cbd Author: David Anderson <[email protected]> Date: Tue Jun 17 06:48:15 2014 -0700 Add comment. commit 06688ff4aced14077dd21a9cc1db4c26c7420ff3 Author: David Anderson <[email protected]> Date: Tue Jun 17 06:46:10 2014 -0700 Allow |this| to be a base type of the methodmap. commit 05cf3682020e0e6d9f47b1a0a6727b9edbfe7622 Author: David Anderson <[email protected]> Date: Mon Jun 16 22:11:58 2014 -0700 Unify duplicate typesymbol checking. commit 09161bf2691c8c1ed25b9b70fda01c336f21aa0b Author: David Anderson <[email protected]> Date: Mon Jun 16 19:53:36 2014 -0700 Close loophole that allowed methodmaps for enums. commit 5bb4aeba89fec47a4de7a7532d27830999d1fcb4 Author: David Anderson <[email protected]> Date: Mon Jun 16 01:50:42 2014 -0700 Add tests and dbi/handle changes. commit b9203e2491daec2a8073874d6375949483778d14 Author: David Anderson <[email protected]> Date: Mon Jun 16 01:38:29 2014 -0700 Ensure methodmap tags are fixed. commit 878b80fd87a2ea500d3a28ce2d53f616d1efe5e8 Author: David Anderson <[email protected]> Date: Mon Jun 16 01:36:04 2014 -0700 Implement inheritance. commit 6ba9e004fbae18ad68056368ddd0affdc78659f1 Author: David Anderson <[email protected]> Date: Mon Jun 16 01:31:00 2014 -0700 Refactor matchtag() to not be insane. commit 4ede6343b0682c6df98fa869153828e92f891bcc Author: David Anderson <[email protected]> Date: Mon Jun 16 01:20:50 2014 -0700 Fix indenting. commit e3ddef8916e3dd5f4ff0fe571d6e1c3acd163352 Author: David Anderson <[email protected]> Date: Mon Jun 16 01:20:27 2014 -0700 Initial prototype.
2014-06-21 04:10:15 -07:00
parent 210759907d
commit 63ad5eff18
47 changed files with 1956 additions and 731 deletions
@@ -0,0 +1,9 @@
+native CloseHandle(Handle:this[]);
+
+methodmap Handle {
+	public Close() = CloseHandle;
+};
+
+public main()
+{
+}
@@ -0,0 +1 @@
+method must have a first argument compatible with the methodmap type (Handle)
@@ -0,0 +1,13 @@
+native Float:CreateHandle(count);
+native CloseHandle(Handle:handle);
+
+methodmap Handle {
+	public Handle() = CreateHandle;
+	public Close() = CloseHandle;
+};
+
+public main() {
+	new Handle:handle = Handle(3);
+	handle.Close();
+}
+
@@ -0,0 +1 @@
+constructor function must return tag Handle
@@ -0,0 +1,8 @@
+native Q(X:this, a);
+
+methodmap X {
+	public ~X() = Q;
+}
+
+public main() {
+}
@@ -0,0 +1 @@
+destructors cannot have extra arguments
@@ -0,0 +1,10 @@
+Q(X:this)
+{
+}
+
+methodmap X {
+	public ~X() = Q;
+}
+
+public main() {
+}
@@ -0,0 +1 @@
+destructors must be native functions
@@ -0,0 +1,8 @@
+native bool:Q();
+
+methodmap X {
+	public ~X() = Q;
+}
+
+public main() {
+}
@@ -0,0 +1 @@
+destructors cannot return values
@@ -0,0 +1,8 @@
+native X:Crab();
+methodmap X {
+	public X() = Crab;
+	public X() = Crab;
+}
+
+public main() {
+}
@@ -0,0 +1 @@
+X was already defined on this methodmap
@@ -0,0 +1,12 @@
+native CloseHandle(Handle:this);
+
+methodmap Handle {
+	public Close() = CloseHandle;
+};
+
+public main()
+{
+	new Handle:x[2];
+
+	x.Close();
+}
@@ -0,0 +1 @@
+cannot call methods on an array
@@ -0,0 +1,10 @@
+native CloseHandle(Handle:this);
+
+methodmap Handle {
+	public Close() = CloseHandle;
+};
+
+public main()
+{
+	main.Close();
+}
@@ -0,0 +1 @@
+cannot call methods on a function
@@ -0,0 +1,9 @@
+native CloseHandle(HandleEgg:this);
+
+methodmap Handle {
+	public Close() = CloseHandle;
+};
+
+public main()
+{
+}
@@ -0,0 +1 @@
+method must have a first argument compatible with the methodmap type (Handle)
@@ -0,0 +1,9 @@
+native CloseHandle({Handle, Egg}:this);
+
+methodmap Handle {
+	public Close() = CloseHandle;
+};
+
+public main()
+{
+}
@@ -0,0 +1 @@
+method must have a first argument compatible with the methodmap type (Handle)
@@ -0,0 +1,9 @@
+native CloseHandle(this);
+
+methodmap Handle {
+	public Close() = CloseHandle;
+};
+
+public main()
+{
+}
@@ -0,0 +1 @@
+method must have a first argument compatible with the methodmap type (Handle)
@@ -0,0 +1,9 @@
+native CloseHandle(&Handle:this);
+
+methodmap Handle {
+	public Close() = CloseHandle;
+};
+
+public main()
+{
+}
@@ -0,0 +1 @@
+method must have a first argument compatible with the methodmap type (Handle)
@@ -0,0 +1,14 @@
+native CloseHandle(Handle:this);
+
+methodmap Handle {
+};
+
+methodmap Crab < Handle {
+	public Close() = CloseHandle;
+};
+
+public main()
+{
+	new Crab:x;
+	x.Close();
+}
@@ -0,0 +1,12 @@
+native Handle:CreateHandle(count);
+native CloseHandle(Handle:handle);
+
+methodmap Handle {
+	public Handle() = CreateHandle;
+	public ~Handle() = CloseHandle;
+};
+
+public main() {
+	new Handle:handle = Handle(3);
+	delete handle;
+}
@@ -0,0 +1,14 @@
+native CloseHandle(Handle:this);
+
+methodmap Handle {
+	public Close() = CloseHandle;
+};
+
+methodmap Crab < Handle {
+};
+
+public main()
+{
+	new Crab:x;
+	x.Close();
+}
@@ -0,0 +1,14 @@
+native CloseHandle(Handle:this);
+
+enum Handle {
+	INVALID_HANDLE = 0,
+};
+
+methodmap Handle {
+	public Close() = CloseHandle;
+};
+
+public main()
+{
+	INVALID_HANDLE.Close();
+}
@@ -0,0 +1,16 @@
+native CloseHandle(Handle:this);
+
+methodmap Handle {
+	public Close() = CloseHandle;
+};
+
+f(const &Handle:x)
+{
+	x.Close()
+}
+
+public main()
+{
+	new Handle:x;
+	f(x)
+}
@@ -0,0 +1,11 @@
+native CloseHandle(Handle:this);
+
+methodmap Handle {
+	public Close() = CloseHandle;
+};
+
+public main()
+{
+	new Handle:x[2];
+	x[1].Close();
+}
@@ -0,0 +1,16 @@
+native CloseHandle(Handle:this);
+
+methodmap Handle {
+	public Close() = CloseHandle;
+};
+
+f(&Handle:x)
+{
+	x.Close()
+}
+
+public main()
+{
+	new Handle:x;
+	f(x)
+}
@@ -0,0 +1,13 @@
+native CloneHandle(Handle:this);
+native CloseHandle(Handle:this);
+
+methodmap Handle {
+	public Clone() = CloneHandle;
+	public Close() = CloseHandle;
+};
+
+public main()
+{
+	new Handle:x;
+	x.Close();
+}
@@ -0,0 +1,74 @@
+# vim: set ts=4 sw=4 tw=99 et:
+import os, sys
+import argparse
+import subprocess
+
+def run_tests(args):
+    testdir = os.path.dirname(os.path.abspath(__file__))
+    tests = []
+    for filename in os.listdir(testdir):
+        base, ext = os.path.splitext(filename)
+        if ext == '.sp':
+            tests += [base]
+
+    failed = False
+
+    for test in tests:
+        print('Testing {0}...'.format(test))
+        if test.startswith('fail-'):
+            kind = 'fail'
+        elif test.startswith('warn-'):
+            kind = 'warn'
+        elif test.startswith('ok-'):
+            kind = 'pass'
+
+        try:
+            argv = [args.spcomp, os.path.join(testdir, test + '.sp')]
+            p = subprocess.Popen(argv, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            stdout, stderr = p.communicate()
+            stdout = stdout.decode('utf-8')
+            stderr = stderr.decode('utf-8')
+
+            smx_path = test + '.smx'
+            compiled = os.path.exists(smx_path)
+            if compiled:
+                os.unlink(smx_path)
+
+            status = 'ok'
+            if compiled and kind == 'fail':
+                status = 'fail'
+            elif not compiled and kind != 'fail':
+                status = 'fail'
+
+            if status == 'ok' and kind != 'pass':
+                with open(os.path.join(testdir, test + '.txt')) as fp:
+                    text = fp.read()
+                if text not in stdout:
+                    print('Expected to find text in stdout: >>>')
+                    print(text)
+                    print('<<<')
+                    status = 'fail'
+            
+            if status == 'fail':
+                failed = True
+                print('FAILED! Dumping stdout/stderr:')
+                print(stdout)
+                print(stderr)
+            else:
+                print('... OK!')
+
+        except Exception as exn:
+            raise
+            sys.stderr.write('FAILED! {0}\n'.format(exn.message))
+
+    if failed:
+        sys.exit(1)
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('spcomp', type=str, help='Path to spcomp')
+    args = parser.parse_args()
+    run_tests(args)
+
+if __name__ == '__main__':
+    main()
@@ -0,0 +1,15 @@
+native CloseHandle(Handle:this);
+
+methodmap Handle {
+	public Close() = CloseHandle;
+};
+
+methodmap Crab {
+};
+
+public main()
+{
+	new Crab:x;
+	new Handle:y;
+	x = y;
+}
@@ -0,0 +1 @@
+tag mismatch
				`@@ -0,0 +1 @@`
				`method must have a first argument compatible with the methodmap type (Handle)`
				`@@ -0,0 +1 @@`
				`constructor function must return tag Handle`