[Swift-commit] r4624 - in trunk/tests/language-behaviour: . IO arithmetic compounds control_structures datatypes logic procedures strings variables
achavez at ci.uchicago.edu
achavez at ci.uchicago.edu
Thu Jun 16 14:15:58 CDT 2011
Author: achavez
Date: 2011-06-16 14:15:58 -0500 (Thu, 16 Jun 2011)
New Revision: 4624
Added:
trunk/tests/language-behaviour/IO/060-duplicate.check.sh
trunk/tests/language-behaviour/IO/060-duplicate.clean.sh
trunk/tests/language-behaviour/IO/060-duplicate.in
trunk/tests/language-behaviour/IO/060-duplicate.out.expected
trunk/tests/language-behaviour/IO/060-duplicate.setup.sh
trunk/tests/language-behaviour/IO/060-duplicate.swift
trunk/tests/language-behaviour/IO/087-external-dataset.swift
trunk/tests/language-behaviour/IO/106-import.setup.sh
trunk/tests/language-behaviour/IO/106-import.swift
trunk/tests/language-behaviour/IO/130-fmri.0000.jpeg.expected
trunk/tests/language-behaviour/IO/130-fmri.0001.h.in
trunk/tests/language-behaviour/IO/130-fmri.0001.jpeg.expected
trunk/tests/language-behaviour/IO/130-fmri.0001.v.in
trunk/tests/language-behaviour/IO/130-fmri.0002.h.in
trunk/tests/language-behaviour/IO/130-fmri.0002.jpeg.expected
trunk/tests/language-behaviour/IO/130-fmri.0002.v.in
trunk/tests/language-behaviour/IO/130-fmri.0003.h.in
trunk/tests/language-behaviour/IO/130-fmri.0003.v.in
trunk/tests/language-behaviour/IO/130-fmri.0004.h.in
trunk/tests/language-behaviour/IO/130-fmri.0004.v.in
trunk/tests/language-behaviour/IO/130-fmri.h.template
trunk/tests/language-behaviour/IO/130-fmri.swift
trunk/tests/language-behaviour/IO/130-fmri.v.template
trunk/tests/language-behaviour/IO/761-dirname.swift
trunk/tests/language-behaviour/IO/q2.swift
trunk/tests/language-behaviour/IO/q20.swift
trunk/tests/language-behaviour/IO/q21.swift
trunk/tests/language-behaviour/IO/q22.swift
trunk/tests/language-behaviour/IO/q23.swift
trunk/tests/language-behaviour/IO/q3.swift
trunk/tests/language-behaviour/IO/q5.swift
trunk/tests/language-behaviour/IO/q6.swift
trunk/tests/language-behaviour/IO/q7.swift
trunk/tests/language-behaviour/IO/testimport.swift
trunk/tests/language-behaviour/IO/testimport2.swift
trunk/tests/language-behaviour/arithmetic/030-mix-float-int.out.expected
trunk/tests/language-behaviour/arithmetic/030-mix-float-int.swift
trunk/tests/language-behaviour/arithmetic/031-add-float.out.expected
trunk/tests/language-behaviour/arithmetic/031-add-float.swift
trunk/tests/language-behaviour/compounds/
trunk/tests/language-behaviour/compounds/0024-compound.Q.out.expected
trunk/tests/language-behaviour/compounds/0024-compound.R.out.expected
trunk/tests/language-behaviour/compounds/0024-compound.swift
trunk/tests/language-behaviour/compounds/00241-nested-single-compound.out.expected
trunk/tests/language-behaviour/compounds/00241-nested-single-compound.swift
trunk/tests/language-behaviour/compounds/00242-compound-with-vars.swift
trunk/tests/language-behaviour/control_structures/
trunk/tests/language-behaviour/control_structures/090-case.out.expected
trunk/tests/language-behaviour/control_structures/090-case.swift
trunk/tests/language-behaviour/control_structures/091-case.out.expected
trunk/tests/language-behaviour/control_structures/091-case.swift
trunk/tests/language-behaviour/control_structures/100-comparison.out.expected
trunk/tests/language-behaviour/control_structures/100-comparison.swift
trunk/tests/language-behaviour/control_structures/101-comparison-string.out.expected
trunk/tests/language-behaviour/control_structures/101-comparison-string.swift
trunk/tests/language-behaviour/control_structures/105-if.out.expected
trunk/tests/language-behaviour/control_structures/105-if.swift
trunk/tests/language-behaviour/control_structures/bug84-comparisons.out.expected
trunk/tests/language-behaviour/control_structures/bug84-comparisons.swift
trunk/tests/language-behaviour/control_structures/bug84-comparisons2.out.expected
trunk/tests/language-behaviour/control_structures/bug84-comparisons2.swift
trunk/tests/language-behaviour/datatypes/
trunk/tests/language-behaviour/datatypes/0231-complex-type.out.expected
trunk/tests/language-behaviour/datatypes/0231-complex-type.swift
trunk/tests/language-behaviour/datatypes/027-single-character-typename.swift
trunk/tests/language-behaviour/datatypes/028-double-character-typename.swift
trunk/tests/language-behaviour/datatypes/032-boolconst.f.out.expected
trunk/tests/language-behaviour/datatypes/032-boolconst.swift
trunk/tests/language-behaviour/datatypes/032-boolconst.t.out.expected
trunk/tests/language-behaviour/datatypes/053-pass-int.out.expected
trunk/tests/language-behaviour/datatypes/053-pass-int.swift
trunk/tests/language-behaviour/datatypes/054-pass-int.out.expected
trunk/tests/language-behaviour/datatypes/054-pass-int.swift
trunk/tests/language-behaviour/datatypes/055-pass-int.out.expected
trunk/tests/language-behaviour/datatypes/055-pass-int.swift
trunk/tests/language-behaviour/datatypes/regress-r2292.swift
trunk/tests/language-behaviour/logic/
trunk/tests/language-behaviour/logic/033-and.ff.out.expected
trunk/tests/language-behaviour/logic/033-and.ft.out.expected
trunk/tests/language-behaviour/logic/033-and.swift
trunk/tests/language-behaviour/logic/033-and.tf.out.expected
trunk/tests/language-behaviour/logic/033-and.tt.out.expected
trunk/tests/language-behaviour/logic/034-or.ff.out.expected
trunk/tests/language-behaviour/logic/034-or.ft.out.expected
trunk/tests/language-behaviour/logic/034-or.swift
trunk/tests/language-behaviour/logic/034-or.tf.out.expected
trunk/tests/language-behaviour/logic/034-or.tt.out.expected
trunk/tests/language-behaviour/logic/035-not.swift
trunk/tests/language-behaviour/procedures/
trunk/tests/language-behaviour/procedures/0026-function-param.swift
trunk/tests/language-behaviour/procedures/00261-function-param-file.clean.sh
trunk/tests/language-behaviour/procedures/00261-function-param-file.in
trunk/tests/language-behaviour/procedures/00261-function-param-file.setup.sh
trunk/tests/language-behaviour/procedures/00261-function-param-file.swift
trunk/tests/language-behaviour/procedures/00262-function-param-file-many.clean.sh
trunk/tests/language-behaviour/procedures/00262-function-param-file-many.in
trunk/tests/language-behaviour/procedures/00262-function-param-file-many.setup.sh
trunk/tests/language-behaviour/procedures/00262-function-param-file-many.swift
trunk/tests/language-behaviour/procedures/080-declare-assign-proc.swift
trunk/tests/language-behaviour/procedures/081-declare-assign-proc.swift
trunk/tests/language-behaviour/procedures/082-declare-assign-proc-separate.swift
trunk/tests/language-behaviour/procedures/089-nested-proc-call.swift
trunk/tests/language-behaviour/procedures/proc-in-expr.swift
trunk/tests/language-behaviour/strings/
trunk/tests/language-behaviour/strings/003-strcat.out.expected
trunk/tests/language-behaviour/strings/003-strcat.swift
trunk/tests/language-behaviour/strings/0031-strcat-op.out.expected
trunk/tests/language-behaviour/strings/0031-strcat-op.swift
trunk/tests/language-behaviour/strings/004-strcat-in-arg.out.expected
trunk/tests/language-behaviour/strings/004-strcat-in-arg.swift
trunk/tests/language-behaviour/strings/005-strcut.out.expected
trunk/tests/language-behaviour/strings/005-strcut.swift
trunk/tests/language-behaviour/strings/0051-regexp.out.expected
trunk/tests/language-behaviour/strings/0051-regexp.swift
trunk/tests/language-behaviour/strings/0052-regexp.out.expected
trunk/tests/language-behaviour/strings/0052-regexp.swift
trunk/tests/language-behaviour/strings/0053-toint.out.expected
trunk/tests/language-behaviour/strings/0053-toint.swift
trunk/tests/language-behaviour/strings/0054-strsplit.out.expected
trunk/tests/language-behaviour/strings/0054-strsplit.swift
trunk/tests/language-behaviour/strings/103-quote.out.expected
trunk/tests/language-behaviour/strings/103-quote.swift
trunk/tests/language-behaviour/strings/1031-quote.swift
trunk/tests/language-behaviour/strings/1032-singlequote.out.expected
trunk/tests/language-behaviour/strings/1032-singlequote.swift
trunk/tests/language-behaviour/strings/1033-singlequote.out.expected
trunk/tests/language-behaviour/strings/1033-singlequote.swift
trunk/tests/language-behaviour/strings/141-space-in-filename.space here.out.expected
trunk/tests/language-behaviour/strings/141-space-in-filename.swift
trunk/tests/language-behaviour/strings/142-space-and-quotes. space .out.expected
trunk/tests/language-behaviour/strings/142-space-and-quotes.1.out.expected
trunk/tests/language-behaviour/strings/142-space-and-quotes.2" space ".out.expected
trunk/tests/language-behaviour/strings/142-space-and-quotes.2.out.expected
trunk/tests/language-behaviour/strings/142-space-and-quotes.3' space '.out.expected
trunk/tests/language-behaviour/strings/142-space-and-quotes.3.out.expected
trunk/tests/language-behaviour/strings/142-space-and-quotes.out.expected
trunk/tests/language-behaviour/strings/142-space-and-quotes.swift
trunk/tests/language-behaviour/strings/1421-space-and-quotes.''' ' ''' '' '''''' ' """"""""" ' ' ' """' "'".out.expected
trunk/tests/language-behaviour/strings/1421-space-and-quotes.1.out.expected
trunk/tests/language-behaviour/strings/1421-space-and-quotes.2 sp"ace .out.expected
trunk/tests/language-behaviour/strings/1421-space-and-quotes.2" space .out.expected
trunk/tests/language-behaviour/strings/1421-space-and-quotes.2' sp"ac"e .out.expected
trunk/tests/language-behaviour/strings/1421-space-and-quotes.2.out.expected
trunk/tests/language-behaviour/strings/1421-space-and-quotes.3 sp'ace .out.expected
trunk/tests/language-behaviour/strings/1421-space-and-quotes.3' sp'ac'e .out.expected
trunk/tests/language-behaviour/strings/1421-space-and-quotes.3' space .out.expected
trunk/tests/language-behaviour/strings/1421-space-and-quotes.3.out.expected
trunk/tests/language-behaviour/strings/1421-space-and-quotes.4.out.expected
trunk/tests/language-behaviour/strings/1421-space-and-quotes.5.out.expected
trunk/tests/language-behaviour/strings/1421-space-and-quotes.6.out.expected
trunk/tests/language-behaviour/strings/1421-space-and-quotes.7.out.expected
trunk/tests/language-behaviour/strings/1421-space-and-quotes.swift
trunk/tests/language-behaviour/strings/143-newlines.out.expected
trunk/tests/language-behaviour/strings/143-newlines.swift
trunk/tests/language-behaviour/strings/145-url.out.expected
trunk/tests/language-behaviour/strings/145-url.swift
trunk/tests/language-behaviour/strings/161-star-dot.out.expected
trunk/tests/language-behaviour/strings/161-star-dot.swift
trunk/tests/language-behaviour/variables/
trunk/tests/language-behaviour/variables/084-declare-many-at-once.swift
trunk/tests/language-behaviour/variables/120-local-vars.out.expected
trunk/tests/language-behaviour/variables/120-local-vars.swift
trunk/tests/language-behaviour/variables/121-multi-return-vars.first.out.expected
trunk/tests/language-behaviour/variables/121-multi-return-vars.second.out.expected
trunk/tests/language-behaviour/variables/121-multi-return-vars.swift
trunk/tests/language-behaviour/variables/122-multi-return-vars.swift
trunk/tests/language-behaviour/variables/123-global-vars.swift
trunk/tests/language-behaviour/variables/1232-global-separate-assign.swift
Removed:
trunk/tests/language-behaviour/0024-compound.Q.out.expected
trunk/tests/language-behaviour/0024-compound.R.out.expected
trunk/tests/language-behaviour/0024-compound.swift
trunk/tests/language-behaviour/00241-nested-single-compound.out.expected
trunk/tests/language-behaviour/00241-nested-single-compound.swift
trunk/tests/language-behaviour/00242-compound-with-vars.swift
trunk/tests/language-behaviour/0026-function-param.swift
trunk/tests/language-behaviour/00261-function-param-file.clean.sh
trunk/tests/language-behaviour/00261-function-param-file.in
trunk/tests/language-behaviour/00261-function-param-file.setup.sh
trunk/tests/language-behaviour/00261-function-param-file.swift
trunk/tests/language-behaviour/00262-function-param-file-many.clean.sh
trunk/tests/language-behaviour/00262-function-param-file-many.in
trunk/tests/language-behaviour/00262-function-param-file-many.setup.sh
trunk/tests/language-behaviour/00262-function-param-file-many.swift
trunk/tests/language-behaviour/003-strcat.out.expected
trunk/tests/language-behaviour/003-strcat.swift
trunk/tests/language-behaviour/0031-strcat-op.out.expected
trunk/tests/language-behaviour/0031-strcat-op.swift
trunk/tests/language-behaviour/004-strcat-in-arg.out.expected
trunk/tests/language-behaviour/004-strcat-in-arg.swift
trunk/tests/language-behaviour/005-strcut.out.expected
trunk/tests/language-behaviour/005-strcut.swift
trunk/tests/language-behaviour/0051-regexp.out.expected
trunk/tests/language-behaviour/0051-regexp.swift
trunk/tests/language-behaviour/0052-regexp.out.expected
trunk/tests/language-behaviour/0052-regexp.swift
trunk/tests/language-behaviour/0053-toint.out.expected
trunk/tests/language-behaviour/0053-toint.swift
trunk/tests/language-behaviour/0054-strsplit.out.expected
trunk/tests/language-behaviour/0054-strsplit.swift
trunk/tests/language-behaviour/0231-complex-type.out.expected
trunk/tests/language-behaviour/0231-complex-type.swift
trunk/tests/language-behaviour/027-single-character-typename.swift
trunk/tests/language-behaviour/028-double-character-typename.swift
trunk/tests/language-behaviour/030-mix-float-int.out.expected
trunk/tests/language-behaviour/030-mix-float-int.swift
trunk/tests/language-behaviour/031-add-float.out.expected
trunk/tests/language-behaviour/031-add-float.swift
trunk/tests/language-behaviour/032-boolconst.f.out.expected
trunk/tests/language-behaviour/032-boolconst.swift
trunk/tests/language-behaviour/032-boolconst.t.out.expected
trunk/tests/language-behaviour/033-and.ff.out.expected
trunk/tests/language-behaviour/033-and.ft.out.expected
trunk/tests/language-behaviour/033-and.swift
trunk/tests/language-behaviour/033-and.tf.out.expected
trunk/tests/language-behaviour/033-and.tt.out.expected
trunk/tests/language-behaviour/034-or.ff.out.expected
trunk/tests/language-behaviour/034-or.ft.out.expected
trunk/tests/language-behaviour/034-or.swift
trunk/tests/language-behaviour/034-or.tf.out.expected
trunk/tests/language-behaviour/034-or.tt.out.expected
trunk/tests/language-behaviour/035-not.swift
trunk/tests/language-behaviour/053-pass-int.out.expected
trunk/tests/language-behaviour/053-pass-int.swift
trunk/tests/language-behaviour/054-pass-int.out.expected
trunk/tests/language-behaviour/054-pass-int.swift
trunk/tests/language-behaviour/055-pass-int.out.expected
trunk/tests/language-behaviour/055-pass-int.swift
trunk/tests/language-behaviour/060-duplicate.check.sh
trunk/tests/language-behaviour/060-duplicate.clean.sh
trunk/tests/language-behaviour/060-duplicate.in
trunk/tests/language-behaviour/060-duplicate.out.expected
trunk/tests/language-behaviour/060-duplicate.setup.sh
trunk/tests/language-behaviour/060-duplicate.swift
trunk/tests/language-behaviour/080-declare-assign-proc.swift
trunk/tests/language-behaviour/081-declare-assign-proc.swift
trunk/tests/language-behaviour/082-declare-assign-proc-separate.swift
trunk/tests/language-behaviour/084-declare-many-at-once.swift
trunk/tests/language-behaviour/085-iterate.swift
trunk/tests/language-behaviour/0851-iterate-using-body-variables.swift
trunk/tests/language-behaviour/087-external-dataset.swift
trunk/tests/language-behaviour/089-nested-proc-call.swift
trunk/tests/language-behaviour/090-case.out.expected
trunk/tests/language-behaviour/090-case.swift
trunk/tests/language-behaviour/091-case.out.expected
trunk/tests/language-behaviour/091-case.swift
trunk/tests/language-behaviour/100-comparison.out.expected
trunk/tests/language-behaviour/100-comparison.swift
trunk/tests/language-behaviour/101-comparison-string.out.expected
trunk/tests/language-behaviour/101-comparison-string.swift
trunk/tests/language-behaviour/103-quote.out.expected
trunk/tests/language-behaviour/103-quote.swift
trunk/tests/language-behaviour/1031-quote.swift
trunk/tests/language-behaviour/1032-singlequote.out.expected
trunk/tests/language-behaviour/1032-singlequote.swift
trunk/tests/language-behaviour/1033-singlequote.out.expected
trunk/tests/language-behaviour/1033-singlequote.swift
trunk/tests/language-behaviour/105-if.out.expected
trunk/tests/language-behaviour/105-if.swift
trunk/tests/language-behaviour/106-import.setup.sh
trunk/tests/language-behaviour/106-import.swift
trunk/tests/language-behaviour/120-local-vars.out.expected
trunk/tests/language-behaviour/120-local-vars.swift
trunk/tests/language-behaviour/121-multi-return-vars.first.out.expected
trunk/tests/language-behaviour/121-multi-return-vars.second.out.expected
trunk/tests/language-behaviour/121-multi-return-vars.swift
trunk/tests/language-behaviour/122-multi-return-vars.swift
trunk/tests/language-behaviour/123-global-vars.swift
trunk/tests/language-behaviour/1232-global-separate-assign.swift
trunk/tests/language-behaviour/130-fmri.0000.jpeg.expected
trunk/tests/language-behaviour/130-fmri.0001.h.in
trunk/tests/language-behaviour/130-fmri.0001.jpeg.expected
trunk/tests/language-behaviour/130-fmri.0001.v.in
trunk/tests/language-behaviour/130-fmri.0002.h.in
trunk/tests/language-behaviour/130-fmri.0002.jpeg.expected
trunk/tests/language-behaviour/130-fmri.0002.v.in
trunk/tests/language-behaviour/130-fmri.0003.h.in
trunk/tests/language-behaviour/130-fmri.0003.v.in
trunk/tests/language-behaviour/130-fmri.0004.h.in
trunk/tests/language-behaviour/130-fmri.0004.v.in
trunk/tests/language-behaviour/130-fmri.h.template
trunk/tests/language-behaviour/130-fmri.swift
trunk/tests/language-behaviour/130-fmri.v.template
trunk/tests/language-behaviour/141-space-in-filename.space here.out.expected
trunk/tests/language-behaviour/141-space-in-filename.swift
trunk/tests/language-behaviour/142-space-and-quotes.1.out.expected
trunk/tests/language-behaviour/142-space-and-quotes.2.out.expected
trunk/tests/language-behaviour/142-space-and-quotes.3.out.expected
trunk/tests/language-behaviour/142-space-and-quotes.out.expected
trunk/tests/language-behaviour/142-space-and-quotes.swift
trunk/tests/language-behaviour/1421-space-and-quotes.1.out.expected
trunk/tests/language-behaviour/1421-space-and-quotes.2.out.expected
trunk/tests/language-behaviour/1421-space-and-quotes.3.out.expected
trunk/tests/language-behaviour/1421-space-and-quotes.4.out.expected
trunk/tests/language-behaviour/1421-space-and-quotes.5.out.expected
trunk/tests/language-behaviour/1421-space-and-quotes.6.out.expected
trunk/tests/language-behaviour/1421-space-and-quotes.7.out.expected
trunk/tests/language-behaviour/1421-space-and-quotes.swift
trunk/tests/language-behaviour/143-newlines.out.expected
trunk/tests/language-behaviour/143-newlines.swift
trunk/tests/language-behaviour/145-url.out.expected
trunk/tests/language-behaviour/145-url.swift
trunk/tests/language-behaviour/161-star-dot.out.expected
trunk/tests/language-behaviour/161-star-dot.swift
trunk/tests/language-behaviour/761-dirname.swift
trunk/tests/language-behaviour/bug84-comparisons.out.expected
trunk/tests/language-behaviour/bug84-comparisons.swift
trunk/tests/language-behaviour/bug84-comparisons2.out.expected
trunk/tests/language-behaviour/bug84-comparisons2.swift
trunk/tests/language-behaviour/foreach/
trunk/tests/language-behaviour/proc-in-expr.swift
trunk/tests/language-behaviour/regress-r2292.swift
trunk/tests/language-behaviour/testimport.swift
trunk/tests/language-behaviour/testimport2.swift
Modified:
trunk/tests/language-behaviour/title.txt
Log:
Language-behaviour Directory reorganized into smaller groups
Deleted: trunk/tests/language-behaviour/0024-compound.Q.out.expected
===================================================================
--- trunk/tests/language-behaviour/0024-compound.Q.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/0024-compound.Q.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-f
Deleted: trunk/tests/language-behaviour/0024-compound.R.out.expected
===================================================================
--- trunk/tests/language-behaviour/0024-compound.R.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/0024-compound.R.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-s
Deleted: trunk/tests/language-behaviour/0024-compound.swift
===================================================================
--- trunk/tests/language-behaviour/0024-compound.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/0024-compound.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,20 +0,0 @@
-type messagefile {}
-
-(messagefile t) greeting(string m) {
- app {
- echo m stdout=@filename(t);
- }
-}
-
-(messagefile first, messagefile second) compound() {
- first = greeting("f");
- second = greeting("s");
-
-}
-
-messagefile a <"0024-compound.Q.out">;
-messagefile b <"0024-compound.R.out">;
-
-(a,b) = compound();
-
-
Deleted: trunk/tests/language-behaviour/00241-nested-single-compound.out.expected
===================================================================
--- trunk/tests/language-behaviour/00241-nested-single-compound.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/00241-nested-single-compound.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-f
Deleted: trunk/tests/language-behaviour/00241-nested-single-compound.swift
===================================================================
--- trunk/tests/language-behaviour/00241-nested-single-compound.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/00241-nested-single-compound.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,21 +0,0 @@
-type file;
-
-(file t) greeting(string m) {
- app {
- echo m stdout=@filename(t);
- }
-}
-
-(file first) compound() {
- first = greeting("f");
-}
-
-(file first) compoundB() {
- first = compound();
-}
-
-file a <"00241-nested-single-compound.out">;
-
-a = compoundB();
-
-
Deleted: trunk/tests/language-behaviour/00242-compound-with-vars.swift
===================================================================
--- trunk/tests/language-behaviour/00242-compound-with-vars.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/00242-compound-with-vars.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,20 +0,0 @@
-type messagefile {}
-
-(messagefile t) greeting(string m) {
- app {
- echo m stdout=@filename(t);
- }
-}
-
-(messagefile first, messagefile second) compound() {
- string third="f";
- first = greeting(third);
- second = greeting("s");
-}
-
-messagefile a <"0024-compound.Q.out">;
-messagefile b <"0024-compound.R.out">;
-
-(a,b) = compound();
-
-
Deleted: trunk/tests/language-behaviour/0026-function-param.swift
===================================================================
--- trunk/tests/language-behaviour/0026-function-param.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/0026-function-param.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,7 +0,0 @@
-(int r) add(int a, int b) {
- r = a + b;
-}
-
-trace(add(1, 1));
-
-trace(add(add(1, 1), add(2, 2)));
Deleted: trunk/tests/language-behaviour/00261-function-param-file.clean.sh
===================================================================
--- trunk/tests/language-behaviour/00261-function-param-file.clean.sh 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/00261-function-param-file.clean.sh 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-rm -v 00261-function-param-file.in || exit 1
-
-exit 0
Deleted: trunk/tests/language-behaviour/00261-function-param-file.in
===================================================================
--- trunk/tests/language-behaviour/00261-function-param-file.in 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/00261-function-param-file.in 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,4 +0,0 @@
-a
-b
-c
-d
Deleted: trunk/tests/language-behaviour/00261-function-param-file.setup.sh
===================================================================
--- trunk/tests/language-behaviour/00261-function-param-file.setup.sh 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/00261-function-param-file.setup.sh 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-cp -v ${GROUP}/00261-function-param-file.in . || exit 1
-
-exit 0
Deleted: trunk/tests/language-behaviour/00261-function-param-file.swift
===================================================================
--- trunk/tests/language-behaviour/00261-function-param-file.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/00261-function-param-file.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,14 +0,0 @@
-type file;
-
-app (file editedParams) setTemps ( file inParams )
-{
-cat stdin=@inParams stdout=@editedParams;
-}
-
-file inParams<single_file_mapper; file="00261-function-param-file.in" >;
-
-string config [] = readData( setTemps(inParams ) );
-
-trace(0,config[0]);
-trace(1,config[1]);
-
Deleted: trunk/tests/language-behaviour/00262-function-param-file-many.clean.sh
===================================================================
--- trunk/tests/language-behaviour/00262-function-param-file-many.clean.sh 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/00262-function-param-file-many.clean.sh 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-rm -v 00262-function-param-file-many.in || exit 1
-
-exit 0
Deleted: trunk/tests/language-behaviour/00262-function-param-file-many.in
===================================================================
--- trunk/tests/language-behaviour/00262-function-param-file-many.in 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/00262-function-param-file-many.in 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,4 +0,0 @@
-a
-b
-c
-d
Deleted: trunk/tests/language-behaviour/00262-function-param-file-many.setup.sh
===================================================================
--- trunk/tests/language-behaviour/00262-function-param-file-many.setup.sh 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/00262-function-param-file-many.setup.sh 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-cp -v ${GROUP}/00262-function-param-file-many.in . || exit 1
-
-exit 0
Deleted: trunk/tests/language-behaviour/00262-function-param-file-many.swift
===================================================================
--- trunk/tests/language-behaviour/00262-function-param-file-many.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/00262-function-param-file-many.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,14 +0,0 @@
-type file;
-
-app (file editedParams) cat ( file inParams )
-{
-cat stdin=@inParams stdout=@editedParams;
-}
-
-file inParams<single_file_mapper; file="00262-function-param-file-many.in" >;
-
-string config [] = readData( cat(cat(cat(inParams ) )));
-
-trace(0,config[0]);
-trace(1,config[1]);
-
Deleted: trunk/tests/language-behaviour/003-strcat.out.expected
===================================================================
--- trunk/tests/language-behaviour/003-strcat.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/003-strcat.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-abcqux
Deleted: trunk/tests/language-behaviour/003-strcat.swift
===================================================================
--- trunk/tests/language-behaviour/003-strcat.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/003-strcat.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,15 +0,0 @@
-type messagefile {}
-
-(messagefile t) greeting(string m) {
- app {
- echo m stdout=@filename(t);
- }
-}
-
-messagefile outfile <"003-strcat.out">;
-
-string v = @strcat("abc","qux");
-
-outfile = greeting(v);
-
-
Deleted: trunk/tests/language-behaviour/0031-strcat-op.out.expected
===================================================================
--- trunk/tests/language-behaviour/0031-strcat-op.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/0031-strcat-op.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-abc,qux
Deleted: trunk/tests/language-behaviour/0031-strcat-op.swift
===================================================================
--- trunk/tests/language-behaviour/0031-strcat-op.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/0031-strcat-op.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,18 +0,0 @@
-type messagefile {}
-
-(messagefile t) greeting(string m) {
- app {
- echo m stdout=@filename(t);
- }
-}
-
-messagefile outfile <"0031-strcat-op.out">;
-
-string a = "abc";
-string b = "qux";
-
-string v = a + "," + b;
-
-outfile = greeting(v);
-
-
Deleted: trunk/tests/language-behaviour/004-strcat-in-arg.out.expected
===================================================================
--- trunk/tests/language-behaviour/004-strcat-in-arg.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/004-strcat-in-arg.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-test004append
Deleted: trunk/tests/language-behaviour/004-strcat-in-arg.swift
===================================================================
--- trunk/tests/language-behaviour/004-strcat-in-arg.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/004-strcat-in-arg.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,13 +0,0 @@
-type messagefile {}
-
-(messagefile t) greeting(string m) {
- app {
- echo m stdout=@filename(t);
- }
-}
-
-messagefile outfile <"004-strcat-in-arg.out">;
-
-outfile = greeting(@strcat("test004","append"));
-
-
Deleted: trunk/tests/language-behaviour/005-strcut.out.expected
===================================================================
--- trunk/tests/language-behaviour/005-strcut.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/005-strcut.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-def
Deleted: trunk/tests/language-behaviour/005-strcut.swift
===================================================================
--- trunk/tests/language-behaviour/005-strcut.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/005-strcut.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,14 +0,0 @@
-type messagefile {}
-
-(messagefile t) greeting(string m) {
- app {
- echo m stdout=@filename(t);
- }
-}
-
-messagefile outfile <"005-strcut.out">;
-
-string v = @strcut("abcdefghi", "abc(def)ghi");
-
-outfile = greeting(v);
-
Deleted: trunk/tests/language-behaviour/0051-regexp.out.expected
===================================================================
--- trunk/tests/language-behaviour/0051-regexp.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/0051-regexp.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-monkey
Deleted: trunk/tests/language-behaviour/0051-regexp.swift
===================================================================
--- trunk/tests/language-behaviour/0051-regexp.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/0051-regexp.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,14 +0,0 @@
-type messagefile {}
-
-(messagefile t) greeting(string m) {
- app {
- echo m stdout=@filename(t);
- }
-}
-
-messagefile outfile <"0051-regexp.out">;
-
-string v = @regexp("abcdefghi", "abc(def)ghi","monkey");
-
-outfile = greeting(v);
-
Deleted: trunk/tests/language-behaviour/0052-regexp.out.expected
===================================================================
--- trunk/tests/language-behaviour/0052-regexp.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/0052-regexp.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-abmonkeyhi
Deleted: trunk/tests/language-behaviour/0052-regexp.swift
===================================================================
--- trunk/tests/language-behaviour/0052-regexp.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/0052-regexp.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,14 +0,0 @@
-type messagefile {}
-
-(messagefile t) greeting(string m) {
- app {
- echo m stdout=@filename(t);
- }
-}
-
-messagefile outfile <"0052-regexp.out">;
-
-string v = @regexp("abcdefghi", "c(def)g","monkey");
-
-outfile = greeting(v);
-
Deleted: trunk/tests/language-behaviour/0053-toint.out.expected
===================================================================
--- trunk/tests/language-behaviour/0053-toint.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/0053-toint.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-109
Deleted: trunk/tests/language-behaviour/0053-toint.swift
===================================================================
--- trunk/tests/language-behaviour/0053-toint.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/0053-toint.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,15 +0,0 @@
-type messagefile;
-
-(messagefile t) greeting(int m) {
- app {
- echo m stdout=@filename(t);
- }
-}
-
-messagefile outfile <"0053-toint.out">;
-
-string left = "010";
-string right = "99";
-
-outfile = greeting(@toint(left) + @toint(right));
-
Deleted: trunk/tests/language-behaviour/0054-strsplit.out.expected
===================================================================
--- trunk/tests/language-behaviour/0054-strsplit.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/0054-strsplit.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-ab , c , def , ghij
Deleted: trunk/tests/language-behaviour/0054-strsplit.swift
===================================================================
--- trunk/tests/language-behaviour/0054-strsplit.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/0054-strsplit.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,14 +0,0 @@
-type messagefile {}
-
-(messagefile t) greeting(string a, string b, string c, string d) {
- app {
- echo a "," b "," c "," d stdout=@filename(t);
- }
-}
-
-messagefile outfile <"0054-strsplit.out">;
-
-string s[] = @strsplit("ab c def ghij", "\\s");
-
-outfile = greeting(s[0], s[1], s[2], s[3]);
-
Deleted: trunk/tests/language-behaviour/0231-complex-type.out.expected
===================================================================
--- trunk/tests/language-behaviour/0231-complex-type.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/0231-complex-type.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-3 44
Deleted: trunk/tests/language-behaviour/0231-complex-type.swift
===================================================================
--- trunk/tests/language-behaviour/0231-complex-type.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/0231-complex-type.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,21 +0,0 @@
-type messagefile {}
-
-type mystruct {
- int first, second;
-}
-
-(messagefile t) greeting(mystruct m) {
- app {
- echo m.first m.second stdout=@filename(t);
- }
-}
-
-messagefile outfile <"0231-complex-type.out">;
-
-mystruct m;
-
-m.first = 3;
-m.second = 44;
-
-outfile = greeting(m);
-
Deleted: trunk/tests/language-behaviour/027-single-character-typename.swift
===================================================================
--- trunk/tests/language-behaviour/027-single-character-typename.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/027-single-character-typename.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,3 +0,0 @@
-type q;
-q i;
-
Deleted: trunk/tests/language-behaviour/028-double-character-typename.swift
===================================================================
--- trunk/tests/language-behaviour/028-double-character-typename.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/028-double-character-typename.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,4 +0,0 @@
-type qq;
-
-qq i;
-
Deleted: trunk/tests/language-behaviour/030-mix-float-int.out.expected
===================================================================
--- trunk/tests/language-behaviour/030-mix-float-int.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/030-mix-float-int.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-54.3
Deleted: trunk/tests/language-behaviour/030-mix-float-int.swift
===================================================================
--- trunk/tests/language-behaviour/030-mix-float-int.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/030-mix-float-int.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,14 +0,0 @@
-type messagefile {}
-
-(messagefile t) greeting(float m) {
- app {
- echo m stdout=@filename(t);
- }
-}
-
-messagefile outfile <"030-mix-float-int.out">;
-
-float f = 42.0 + 12.3;
-
-outfile = greeting(f);
-
Deleted: trunk/tests/language-behaviour/031-add-float.out.expected
===================================================================
--- trunk/tests/language-behaviour/031-add-float.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/031-add-float.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-135.3
Deleted: trunk/tests/language-behaviour/031-add-float.swift
===================================================================
--- trunk/tests/language-behaviour/031-add-float.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/031-add-float.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,14 +0,0 @@
-type messagefile {}
-
-(messagefile t) greeting(float m) {
- app {
- echo m stdout=@filename(t);
- }
-}
-
-messagefile outfile <"031-add-float.out">;
-
-float i = 42.1+93.2;
-
-outfile = greeting(i);
-
Deleted: trunk/tests/language-behaviour/032-boolconst.f.out.expected
===================================================================
--- trunk/tests/language-behaviour/032-boolconst.f.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/032-boolconst.f.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-false
Deleted: trunk/tests/language-behaviour/032-boolconst.swift
===================================================================
--- trunk/tests/language-behaviour/032-boolconst.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/032-boolconst.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,14 +0,0 @@
-type messagefile;
-
-(messagefile t) p(boolean b) {
- app {
- echo b stdout=@filename(t);
- }
-}
-
-messagefile tfile <"032-boolconst.t.out">;
-messagefile ffile <"032-boolconst.f.out">;
-
-tfile = p(true);
-ffile = p(false);
-
Deleted: trunk/tests/language-behaviour/032-boolconst.t.out.expected
===================================================================
--- trunk/tests/language-behaviour/032-boolconst.t.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/032-boolconst.t.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-true
Deleted: trunk/tests/language-behaviour/033-and.ff.out.expected
===================================================================
--- trunk/tests/language-behaviour/033-and.ff.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/033-and.ff.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-false
Deleted: trunk/tests/language-behaviour/033-and.ft.out.expected
===================================================================
--- trunk/tests/language-behaviour/033-and.ft.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/033-and.ft.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-false
Deleted: trunk/tests/language-behaviour/033-and.swift
===================================================================
--- trunk/tests/language-behaviour/033-and.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/033-and.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,18 +0,0 @@
-type messagefile;
-
-(messagefile t) p(boolean b) {
- app {
- echo b stdout=@filename(t);
- }
-}
-
-messagefile fffile <"033-and.ff.out">;
-messagefile ftfile <"033-and.ft.out">;
-messagefile tffile <"033-and.tf.out">;
-messagefile ttfile <"033-and.tt.out">;
-
-fffile = p(false && false);
-ftfile = p(false && true);
-tffile = p(true && false);
-ttfile = p(true && true);
-
Deleted: trunk/tests/language-behaviour/033-and.tf.out.expected
===================================================================
--- trunk/tests/language-behaviour/033-and.tf.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/033-and.tf.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-false
Deleted: trunk/tests/language-behaviour/033-and.tt.out.expected
===================================================================
--- trunk/tests/language-behaviour/033-and.tt.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/033-and.tt.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-true
Deleted: trunk/tests/language-behaviour/034-or.ff.out.expected
===================================================================
--- trunk/tests/language-behaviour/034-or.ff.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/034-or.ff.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-false
Deleted: trunk/tests/language-behaviour/034-or.ft.out.expected
===================================================================
--- trunk/tests/language-behaviour/034-or.ft.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/034-or.ft.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-true
Deleted: trunk/tests/language-behaviour/034-or.swift
===================================================================
--- trunk/tests/language-behaviour/034-or.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/034-or.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,18 +0,0 @@
-type messagefile;
-
-(messagefile t) p(boolean b) {
- app {
- echo b stdout=@filename(t);
- }
-}
-
-messagefile fffile <"034-or.ff.out">;
-messagefile ftfile <"034-or.ft.out">;
-messagefile tffile <"034-or.tf.out">;
-messagefile ttfile <"034-or.tt.out">;
-
-fffile = p(false || false);
-ftfile = p(false || true);
-tffile = p(true || false);
-ttfile = p(true || true);
-
Deleted: trunk/tests/language-behaviour/034-or.tf.out.expected
===================================================================
--- trunk/tests/language-behaviour/034-or.tf.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/034-or.tf.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-true
Deleted: trunk/tests/language-behaviour/034-or.tt.out.expected
===================================================================
--- trunk/tests/language-behaviour/034-or.tt.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/034-or.tt.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-true
Deleted: trunk/tests/language-behaviour/035-not.swift
===================================================================
--- trunk/tests/language-behaviour/035-not.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/035-not.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,14 +0,0 @@
-type messagefile;
-
-(messagefile t) p(boolean b) {
- app {
- echo b stdout=@filename(t);
- }
-}
-
-messagefile tfile <"035-not.t.out">;
-messagefile ffile <"035-not.f.out">;
-
-tfile = p(!true);
-ffile = p(!false);
-
Deleted: trunk/tests/language-behaviour/053-pass-int.out.expected
===================================================================
--- trunk/tests/language-behaviour/053-pass-int.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/053-pass-int.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-7
Deleted: trunk/tests/language-behaviour/053-pass-int.swift
===================================================================
--- trunk/tests/language-behaviour/053-pass-int.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/053-pass-int.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,12 +0,0 @@
-type messagefile {}
-
-(messagefile t) greeting(string m, int i) {
- app {
- echo i stdout=@filename(t);
- }
-}
-
-messagefile outfile <"053-pass-int.out">;
-
-outfile = greeting("hi", 7);
-
Deleted: trunk/tests/language-behaviour/054-pass-int.out.expected
===================================================================
--- trunk/tests/language-behaviour/054-pass-int.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/054-pass-int.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-99
Deleted: trunk/tests/language-behaviour/054-pass-int.swift
===================================================================
--- trunk/tests/language-behaviour/054-pass-int.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/054-pass-int.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,14 +0,0 @@
-type messagefile {}
-
-(messagefile t) greeting(string m, int i) {
- app {
- echo i stdout=@filename(t);
- }
-}
-
-messagefile outfile <"054-pass-int.out">;
-
-int luftballons = 99;
-
-outfile = greeting("hi", luftballons);
-
Deleted: trunk/tests/language-behaviour/055-pass-int.out.expected
===================================================================
--- trunk/tests/language-behaviour/055-pass-int.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/055-pass-int.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-99
Deleted: trunk/tests/language-behaviour/055-pass-int.swift
===================================================================
--- trunk/tests/language-behaviour/055-pass-int.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/055-pass-int.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,16 +0,0 @@
-type messagefile {}
-
-(messagefile t) greeting(string m, int i) {
- app {
- echo i stdout=@filename(t);
- }
-}
-
-messagefile outfile <"055-pass-int.out">;
-
-int luftballons;
-
-luftballons = 99;
-
-outfile = greeting("hi", luftballons);
-
Deleted: trunk/tests/language-behaviour/060-duplicate.check.sh
===================================================================
--- trunk/tests/language-behaviour/060-duplicate.check.sh 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/060-duplicate.check.sh 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-grep 060-duplicate.in 060-duplicate.out || exit 1
-
-exit 0
Deleted: trunk/tests/language-behaviour/060-duplicate.clean.sh
===================================================================
--- trunk/tests/language-behaviour/060-duplicate.clean.sh 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/060-duplicate.clean.sh 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-rm -v 060-duplicate.in || exit 1
-rm -v 060-duplicate.out || exit 1
-
-exit 0
Deleted: trunk/tests/language-behaviour/060-duplicate.in
===================================================================
--- trunk/tests/language-behaviour/060-duplicate.in 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/060-duplicate.in 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-duplicatesource
Deleted: trunk/tests/language-behaviour/060-duplicate.out.expected
===================================================================
--- trunk/tests/language-behaviour/060-duplicate.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/060-duplicate.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-060-duplicate.in
Deleted: trunk/tests/language-behaviour/060-duplicate.setup.sh
===================================================================
--- trunk/tests/language-behaviour/060-duplicate.setup.sh 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/060-duplicate.setup.sh 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-cp -v ${GROUP}/060-duplicate.in . || exit 1
-
-exit 0
Deleted: trunk/tests/language-behaviour/060-duplicate.swift
===================================================================
--- trunk/tests/language-behaviour/060-duplicate.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/060-duplicate.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,15 +0,0 @@
-type file;
-
-
-file input <"060-duplicate.in">;
-
-file output <"060-duplicate.out">;
-
-(file t) echo(file m) {
- app {
- echo @filename(m) stdout=@filename(t);
- }
-}
-
-output = echo(input);
-
Deleted: trunk/tests/language-behaviour/080-declare-assign-proc.swift
===================================================================
--- trunk/tests/language-behaviour/080-declare-assign-proc.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/080-declare-assign-proc.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,12 +0,0 @@
-type messagefile {}
-
-(messagefile t) greeting() {
- app {
- echo "hello" stdout=@filename(t);
- }
-}
-
-messagefile outfile = greeting();
-
-// can't check the output in present framework because don't know
-// what filename got chosen for outfile...
Deleted: trunk/tests/language-behaviour/081-declare-assign-proc.swift
===================================================================
--- trunk/tests/language-behaviour/081-declare-assign-proc.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/081-declare-assign-proc.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,12 +0,0 @@
-type messagefile {}
-
-(messagefile t) greeting(int i) {
- app {
- echo i stdout=@filename(t);
- }
-}
-
-messagefile outfile = greeting(3 + 2);
-
-// can't check the output in present framework because don't know
-// what filename got chosen for outfile...
Deleted: trunk/tests/language-behaviour/082-declare-assign-proc-separate.swift
===================================================================
--- trunk/tests/language-behaviour/082-declare-assign-proc-separate.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/082-declare-assign-proc-separate.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,13 +0,0 @@
-type messagefile {}
-
-(messagefile t) greeting() {
- app {
- echo "hello" stdout=@filename(t);
- }
-}
-
-messagefile outfile;
-outfile = greeting();
-
-// can't check the output in present framework because don't know
-// what filename got chosen for outfile...
Deleted: trunk/tests/language-behaviour/084-declare-many-at-once.swift
===================================================================
--- trunk/tests/language-behaviour/084-declare-many-at-once.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/084-declare-many-at-once.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,19 +0,0 @@
-type messagefile {}
-
-(messagefile t) greeting() {
- app {
- echo "hello" stdout=@filename(t);
- }
-}
-
-messagefile outfile = greeting();
-
-messagefile o2 = greeting(), o4 = greeting(), o5, o6[], o7=greeting();
-
-o6[0] = greeting();
-o6[1] = greeting();
-o5 = greeting();
-o6[2] = greeting();
-
-// can't check the output in present framework because don't know
-// what filename got chosen for outfile...
Deleted: trunk/tests/language-behaviour/085-iterate.swift
===================================================================
--- trunk/tests/language-behaviour/085-iterate.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/085-iterate.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,17 +0,0 @@
-type messagefile;
-
-(messagefile t) greeting() {
- app {
- echo "hello" stdout=@filename(t);
- }
-}
-
-messagefile outfile[] <simple_mapper;
- prefix="085-iterate.",
- suffix=".out">;
-
-iterate i {
- outfile[i] = greeting();
-} until(i>10);
-
-
Deleted: trunk/tests/language-behaviour/0851-iterate-using-body-variables.swift
===================================================================
--- trunk/tests/language-behaviour/0851-iterate-using-body-variables.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/0851-iterate-using-body-variables.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,18 +0,0 @@
-type messagefile;
-
-(messagefile t) greeting() {
- app {
- echo "hello" stdout=@filename(t);
- }
-}
-
-messagefile outfile[] <simple_mapper;
- prefix="085-iterate.",
- suffix=".out">;
-
-iterate i {
- int j = i;
- outfile[i] = greeting();
-} until(j>10);
-
-
Deleted: trunk/tests/language-behaviour/087-external-dataset.swift
===================================================================
--- trunk/tests/language-behaviour/087-external-dataset.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/087-external-dataset.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,19 +0,0 @@
-type file;
-
-(external o) a() {
- app {
- touch "foo";
- }
-}
-
-b(external o) {
- app {
- touch "bar";
- }
-}
-
-external sync;
-
-sync=a();
-b(sync);
-
Deleted: trunk/tests/language-behaviour/089-nested-proc-call.swift
===================================================================
--- trunk/tests/language-behaviour/089-nested-proc-call.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/089-nested-proc-call.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,21 +0,0 @@
-type messagefile;
-
-(messagefile t) inner_greeting() {
- app {
- echo "hello" stdout=@filename(t);
- }
-}
-
-(string s) outer_greeting() {
- messagefile m <"ssss">;
- m = inner_greeting();
- s = readData(m);
-}
-
-
-// messagefile outfile <"089-nested-proc-call.swift">;
-
-// outfile = greeting();
-
-trace(outer_greeting());
-
Deleted: trunk/tests/language-behaviour/090-case.out.expected
===================================================================
--- trunk/tests/language-behaviour/090-case.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/090-case.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-eighth message
Deleted: trunk/tests/language-behaviour/090-case.swift
===================================================================
--- trunk/tests/language-behaviour/090-case.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/090-case.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,27 +0,0 @@
-type messagefile {}
-
-(messagefile t) greeting(string m) {
- app {
- echo m stdout=@filename(t);
- }
-}
-
-messagefile outfile <"090-case.out">;
-
-
-string message;
-
-switch(8) {
- case 3:
- message="first message";
- case 8:
- message="eighth message";
- case 57:
- message="last message";
- default:
- message="no message at all...";
-}
-
-trace(message);
-outfile = greeting(message);
-
Deleted: trunk/tests/language-behaviour/091-case.out.expected
===================================================================
--- trunk/tests/language-behaviour/091-case.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/091-case.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-eighth message
Deleted: trunk/tests/language-behaviour/091-case.swift
===================================================================
--- trunk/tests/language-behaviour/091-case.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/091-case.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,29 +0,0 @@
-type messagefile {}
-
-(messagefile t) greeting(string m) {
- app {
- echo m stdout=@filename(t);
- }
-}
-
-messagefile outfile <"091-case.out">;
-
-int selector = 8;
-
-trace(selector);
-
-string message;
-
-switch(selector) {
- case 3:
- message="first message";
- case 8:
- message="eighth message";
- case 57:
- message="last message";
- default:
- message="no message at all...";
-}
-
-outfile = greeting(message);
-
Deleted: trunk/tests/language-behaviour/100-comparison.out.expected
===================================================================
--- trunk/tests/language-behaviour/100-comparison.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/100-comparison.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-true
Deleted: trunk/tests/language-behaviour/100-comparison.swift
===================================================================
--- trunk/tests/language-behaviour/100-comparison.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/100-comparison.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,14 +0,0 @@
-type messagefile {}
-
-(messagefile t) greeting(boolean b) {
- app {
- echo b stdout=@filename(t);
- }
-}
-
-messagefile outfile <"100-comparison.out">;
-
-boolean r = 1==1;
-
-outfile = greeting(r);
-
Deleted: trunk/tests/language-behaviour/101-comparison-string.out.expected
===================================================================
--- trunk/tests/language-behaviour/101-comparison-string.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/101-comparison-string.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-true
Deleted: trunk/tests/language-behaviour/101-comparison-string.swift
===================================================================
--- trunk/tests/language-behaviour/101-comparison-string.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/101-comparison-string.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,16 +0,0 @@
-type messagefile {}
-
-(messagefile t) greeting(boolean b) {
- app {
- echo b stdout=@filename(t);
- }
-}
-
-messagefile outfile <"101-comparison-string.out">;
-
-string s = "hello";
-
-boolean r = s=="hello";
-
-outfile = greeting(r);
-
Deleted: trunk/tests/language-behaviour/103-quote.out.expected
===================================================================
--- trunk/tests/language-behaviour/103-quote.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/103-quote.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-"
Deleted: trunk/tests/language-behaviour/103-quote.swift
===================================================================
--- trunk/tests/language-behaviour/103-quote.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/103-quote.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,12 +0,0 @@
-type messagefile;
-
-(messagefile t) greeting() {
- app {
- echo "\"" stdout=@filename(t);
- }
-}
-
-messagefile outfile <"103-quote.out">;
-
-outfile = greeting();
-
Deleted: trunk/tests/language-behaviour/1031-quote.swift
===================================================================
--- trunk/tests/language-behaviour/1031-quote.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/1031-quote.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,12 +0,0 @@
-type messagefile;
-
-(messagefile t) greeting() {
- app {
- echo "testing \"quotes\" in swift" stdout=@filename(t);
- }
-}
-
-messagefile outfile <"1031-quote.out">;
-
-outfile = greeting();
-
Deleted: trunk/tests/language-behaviour/1032-singlequote.out.expected
===================================================================
--- trunk/tests/language-behaviour/1032-singlequote.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/1032-singlequote.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-testing 'quotes' in swift
Deleted: trunk/tests/language-behaviour/1032-singlequote.swift
===================================================================
--- trunk/tests/language-behaviour/1032-singlequote.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/1032-singlequote.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,12 +0,0 @@
-type messagefile;
-
-(messagefile t) greeting() {
- app {
- echo "testing 'quotes' in swift" stdout=@filename(t);
- }
-}
-
-messagefile outfile <"1032-singlequote.out">;
-
-outfile = greeting();
-
Deleted: trunk/tests/language-behaviour/1033-singlequote.out.expected
===================================================================
--- trunk/tests/language-behaviour/1033-singlequote.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/1033-singlequote.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-'
Deleted: trunk/tests/language-behaviour/1033-singlequote.swift
===================================================================
--- trunk/tests/language-behaviour/1033-singlequote.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/1033-singlequote.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,12 +0,0 @@
-type messagefile;
-
-(messagefile t) greeting() {
- app {
- echo "'" stdout=@filename(t);
- }
-}
-
-messagefile outfile <"1033-singlequote.out">;
-
-outfile = greeting();
-
Deleted: trunk/tests/language-behaviour/105-if.out.expected
===================================================================
--- trunk/tests/language-behaviour/105-if.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/105-if.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-hello
Deleted: trunk/tests/language-behaviour/105-if.swift
===================================================================
--- trunk/tests/language-behaviour/105-if.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/105-if.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,16 +0,0 @@
-type messagefile;
-
-(messagefile t) greeting() {
- app {
- echo "hello" stdout=@filename(t);
- }
-}
-
-messagefile outfile <"105-if.out">;
-
-boolean b = 1==1;
-
-if(b) {
- outfile = greeting();
-}
-
Deleted: trunk/tests/language-behaviour/106-import.setup.sh
===================================================================
--- trunk/tests/language-behaviour/106-import.setup.sh 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/106-import.setup.sh 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-cp -v ${GROUP}/testimport.swift . || exit 1
-cp -v ${GROUP}/testimport2.swift . || exit 1
-
-exit 0
Deleted: trunk/tests/language-behaviour/106-import.swift
===================================================================
--- trunk/tests/language-behaviour/106-import.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/106-import.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,5 +0,0 @@
-import "testimport";
-
-file f;
-
-int i = 6;
Deleted: trunk/tests/language-behaviour/120-local-vars.out.expected
===================================================================
--- trunk/tests/language-behaviour/120-local-vars.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/120-local-vars.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-hi
Deleted: trunk/tests/language-behaviour/120-local-vars.swift
===================================================================
--- trunk/tests/language-behaviour/120-local-vars.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/120-local-vars.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,17 +0,0 @@
-type messagefile;
-
-(messagefile t) metagreeting(string m) {
-string l = m;
-t=greeting(l);
-}
-
-(messagefile t) greeting(string m) {
- app {
- echo m stdout=@filename(t);
- }
-}
-
-messagefile outfile <"120-local-vars.out">;
-
-outfile = greeting("hi");
-
Deleted: trunk/tests/language-behaviour/121-multi-return-vars.first.out.expected
===================================================================
--- trunk/tests/language-behaviour/121-multi-return-vars.first.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/121-multi-return-vars.first.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-hi
Deleted: trunk/tests/language-behaviour/121-multi-return-vars.second.out.expected
===================================================================
Deleted: trunk/tests/language-behaviour/121-multi-return-vars.swift
===================================================================
--- trunk/tests/language-behaviour/121-multi-return-vars.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/121-multi-return-vars.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,13 +0,0 @@
-type messagefile;
-
-(messagefile a, messagefile b) greeting(string m) {
- app {
- echo m stdout=@filename(a) stderr=@filename(b);
- }
-}
-
-messagefile firstfile <"121-multi-return-vars.first.out">;
-messagefile secondfile <"121-multi-return-vars.second.out">;
-
-(firstfile, secondfile) = greeting("hi");
-
Deleted: trunk/tests/language-behaviour/122-multi-return-vars.swift
===================================================================
--- trunk/tests/language-behaviour/122-multi-return-vars.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/122-multi-return-vars.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,10 +0,0 @@
-type messagefile;
-
-(messagefile a, messagefile b) greeting(string m) {
- app {
- echo m stdout=@filename(a) stderr=@filename(b);
- }
-}
-
-(messagefile firstfile, messagefile secondfile) = greeting("hi");
-
Deleted: trunk/tests/language-behaviour/123-global-vars.swift
===================================================================
--- trunk/tests/language-behaviour/123-global-vars.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/123-global-vars.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,14 +0,0 @@
-type messagefile;
-
-
-(messagefile t) greeting() {
- app {
- echo m stdout=@filename(t);
- }
-}
-
-global string m = "hello";
-messagefile outfile <"123-global-vars.out">;
-
-outfile = greeting();
-
Deleted: trunk/tests/language-behaviour/1232-global-separate-assign.swift
===================================================================
--- trunk/tests/language-behaviour/1232-global-separate-assign.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/1232-global-separate-assign.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,15 +0,0 @@
-type messagefile;
-
-
-(messagefile t) greeting() {
- app {
- echo m stdout=@filename(t);
- }
-}
-
-global string m;
-m = "hi";
-messagefile outfile <"1232-global-separate-assign.aout">;
-
-outfile = greeting();
-
Deleted: trunk/tests/language-behaviour/130-fmri.0000.jpeg.expected
===================================================================
Deleted: trunk/tests/language-behaviour/130-fmri.0001.h.in
===================================================================
--- trunk/tests/language-behaviour/130-fmri.0001.h.in 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/130-fmri.0001.h.in 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-qux
Deleted: trunk/tests/language-behaviour/130-fmri.0001.jpeg.expected
===================================================================
Deleted: trunk/tests/language-behaviour/130-fmri.0001.v.in
===================================================================
--- trunk/tests/language-behaviour/130-fmri.0001.v.in 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/130-fmri.0001.v.in 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-qux
Deleted: trunk/tests/language-behaviour/130-fmri.0002.h.in
===================================================================
--- trunk/tests/language-behaviour/130-fmri.0002.h.in 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/130-fmri.0002.h.in 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-qux
Deleted: trunk/tests/language-behaviour/130-fmri.0002.jpeg.expected
===================================================================
Deleted: trunk/tests/language-behaviour/130-fmri.0002.v.in
===================================================================
--- trunk/tests/language-behaviour/130-fmri.0002.v.in 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/130-fmri.0002.v.in 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-qux
Deleted: trunk/tests/language-behaviour/130-fmri.0003.h.in
===================================================================
--- trunk/tests/language-behaviour/130-fmri.0003.h.in 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/130-fmri.0003.h.in 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-qux
Deleted: trunk/tests/language-behaviour/130-fmri.0003.v.in
===================================================================
--- trunk/tests/language-behaviour/130-fmri.0003.v.in 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/130-fmri.0003.v.in 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-qux
Deleted: trunk/tests/language-behaviour/130-fmri.0004.h.in
===================================================================
--- trunk/tests/language-behaviour/130-fmri.0004.h.in 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/130-fmri.0004.h.in 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-qux
Deleted: trunk/tests/language-behaviour/130-fmri.0004.v.in
===================================================================
--- trunk/tests/language-behaviour/130-fmri.0004.v.in 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/130-fmri.0004.v.in 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-qux
Deleted: trunk/tests/language-behaviour/130-fmri.h.template
===================================================================
--- trunk/tests/language-behaviour/130-fmri.h.template 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/130-fmri.h.template 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-foo
Deleted: trunk/tests/language-behaviour/130-fmri.swift
===================================================================
--- trunk/tests/language-behaviour/130-fmri.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/130-fmri.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,78 +0,0 @@
-
-# attempt to emulate the workflow patterns of the fMRI workflow that
-# I often fiddle with.
-
-type voxels;
-type header;
-
-type volume {
- voxels v;
- header h;
- }
-
-type slice;
-
-type jpeg;
-
-
-// inputs: 4 volumes and a reference volume
-
-volume inputs[] <simple_mapper;prefix="130-fmri.",suffix=".in">;
-volume template <simple_mapper;prefix="130-fmri.",suffix=".template">;
-
-// align 4 volumes to reference volume
-
-volume aligned[];
-
-foreach inp, i in inputs {
- aligned[i] = align(inputs[i], template);
-}
-
-(volume o) align(volume candidate, volume template) {
- app {
- touch @o.v @o.h;
- }
-}
-
-// take average of all 4 (or 5?) volumes
-
-(volume avg) average(volume candidates[]) {
- app {
- touch @avg.v @avg.h;
- }
-}
-
-volume brainatlas = average(aligned);
-
-// make 3 slices of the average volume, along x, y, z axes
-
-(slice s) slicer(volume atlas, string axis) {
- app {
- touch @s;
- }
-}
-
-slice slices[];
-
-
-string axes[] = ["x", "y", "z"];
-foreach axis, i in axes {
- slices[i] = slicer(brainatlas, axis);
-}
-
-// convert each slice into a jpeg
-
-jpeg final[] <simple_mapper;prefix="130-fmri.",suffix=".jpeg">;
-
-(jpeg j) convert(slice s) {
- app {
- touch @j;
- }
-}
-
-foreach j,i in slices {
- final[i] = convert(slices[i]);
-}
-
-// outputs: 3 jpegs
-
Deleted: trunk/tests/language-behaviour/130-fmri.v.template
===================================================================
--- trunk/tests/language-behaviour/130-fmri.v.template 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/130-fmri.v.template 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-foo
Deleted: trunk/tests/language-behaviour/141-space-in-filename.space here.out.expected
===================================================================
--- trunk/tests/language-behaviour/141-space-in-filename.space here.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/141-space-in-filename.space here.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-hello
Deleted: trunk/tests/language-behaviour/141-space-in-filename.swift
===================================================================
--- trunk/tests/language-behaviour/141-space-in-filename.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/141-space-in-filename.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,12 +0,0 @@
-type messagefile;
-
-(messagefile t) greeting() {
- app {
- echo "hello" stdout=@filename(t);
- }
-}
-
-messagefile outfile <"141-space-in-filename.space here.out">;
-
-outfile = greeting();
-
Deleted: trunk/tests/language-behaviour/142-space-and-quotes.1.out.expected
===================================================================
Deleted: trunk/tests/language-behaviour/142-space-and-quotes.2.out.expected
===================================================================
Deleted: trunk/tests/language-behaviour/142-space-and-quotes.3.out.expected
===================================================================
Deleted: trunk/tests/language-behaviour/142-space-and-quotes.out.expected
===================================================================
Deleted: trunk/tests/language-behaviour/142-space-and-quotes.swift
===================================================================
--- trunk/tests/language-behaviour/142-space-and-quotes.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/142-space-and-quotes.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,24 +0,0 @@
-
-// this checks how spaces and quotes get passed through to underlying
-// executables
-
-type messagefile;
-
-(messagefile t) p() {
- app {
- touch @filename(t);
- }
-}
-
-messagefile outfile <"142-space-and-quotes.out">;
-outfile = p();
-
-messagefile outfileB <"142-space-and-quotes. space .out">;
-outfileB = p();
-
-messagefile outfileC <"142-space-and-quotes.2\" space \".out">;
-outfileC = p();
-
-messagefile outfileD <"142-space-and-quotes.3' space '.out">;
-outfileD = p();
-
Deleted: trunk/tests/language-behaviour/1421-space-and-quotes.1.out.expected
===================================================================
Deleted: trunk/tests/language-behaviour/1421-space-and-quotes.2.out.expected
===================================================================
Deleted: trunk/tests/language-behaviour/1421-space-and-quotes.3.out.expected
===================================================================
Deleted: trunk/tests/language-behaviour/1421-space-and-quotes.4.out.expected
===================================================================
Deleted: trunk/tests/language-behaviour/1421-space-and-quotes.5.out.expected
===================================================================
Deleted: trunk/tests/language-behaviour/1421-space-and-quotes.6.out.expected
===================================================================
Deleted: trunk/tests/language-behaviour/1421-space-and-quotes.7.out.expected
===================================================================
Deleted: trunk/tests/language-behaviour/1421-space-and-quotes.swift
===================================================================
--- trunk/tests/language-behaviour/1421-space-and-quotes.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/1421-space-and-quotes.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,32 +0,0 @@
-
-// this checks how spaces and quotes get passed through to underlying
-// executables
-
-type messagefile;
-
-(messagefile t) p() {
- app {
- touch @filename(t);
- }
-}
-
-messagefile outfileC <"1421-space-and-quotes.2\" space .out">;
-outfileC = p();
-
-messagefile outfileD <"1421-space-and-quotes.3' space .out">;
-outfileD = p();
-
-messagefile outfileE <"1421-space-and-quotes.2 sp\"ace .out">;
-outfileE = p();
-
-messagefile outfileF <"1421-space-and-quotes.3 sp'ace .out">;
-outfileF = p();
-
-messagefile outfileG <"1421-space-and-quotes.2' sp\"ac\"e .out">;
-outfileG = p();
-
-messagefile outfileH <"1421-space-and-quotes.3' sp'ac'e .out">;
-outfileH = p();
-
-messagefile outfileI <"1421-space-and-quotes.''' ' ''' '' '''''' ' \"\"\"\"\"\"\"\"\" ' ' ' \"\"\"' \"'\".out">;
-outfileI = p();
Deleted: trunk/tests/language-behaviour/143-newlines.out.expected
===================================================================
--- trunk/tests/language-behaviour/143-newlines.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/143-newlines.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-hello world
Deleted: trunk/tests/language-behaviour/143-newlines.swift
===================================================================
--- trunk/tests/language-behaviour/143-newlines.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/143-newlines.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,13 +0,0 @@
-type messagefile;
-
-(messagefile t) greeting() {
- app {
- echo "hello"
- "world" stdout=@filename(t);
- }
-}
-
-messagefile outfile <"143-newlines.out">;
-
-outfile = greeting();
-
Deleted: trunk/tests/language-behaviour/145-url.out.expected
===================================================================
--- trunk/tests/language-behaviour/145-url.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/145-url.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-hello
Deleted: trunk/tests/language-behaviour/145-url.swift
===================================================================
--- trunk/tests/language-behaviour/145-url.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/145-url.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,12 +0,0 @@
-type messagefile;
-
-(messagefile t) greeting() {
- app {
- echo "hello" stdout=@filename(t);
- }
-}
-
-messagefile outfile <"file://localhost/145-url.out">;
-
-outfile = greeting();
-
Deleted: trunk/tests/language-behaviour/161-star-dot.out.expected
===================================================================
--- trunk/tests/language-behaviour/161-star-dot.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/161-star-dot.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-two-C
Deleted: trunk/tests/language-behaviour/161-star-dot.swift
===================================================================
--- trunk/tests/language-behaviour/161-star-dot.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/161-star-dot.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,36 +0,0 @@
-type messagefile;
-
-(messagefile t) greeting(string s) {
- app {
- echo s stdout=@filename(t);
- }
-}
-
-messagefile outfile <"161-star-dot.out">;
-
-type astruct {
- string a;
- string b;
- string c;
-};
-
-astruct foo[];
-
-foo[0].a = "zero-A";
-foo[0].b = "zero-B";
-foo[0].c = "zero-C";
-
-foo[1].a = "one-A";
-foo[1].b = "one-B";
-foo[1].c = "one-C";
-
-foo[2].a = "two-A";
-foo[2].b = "two-B";
-foo[2].c = "two-C";
-
-string s[] = foo[*].c;
-
-string u = s[2];
-
-outfile = greeting(u);
-
Deleted: trunk/tests/language-behaviour/761-dirname.swift
===================================================================
--- trunk/tests/language-behaviour/761-dirname.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/761-dirname.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,9 +0,0 @@
-
-type file{}
-
-file f<"/d/f.txt">;
-
-string s = @dirname(f);
-string t = @tostring(s);
-
-tracef("dirname: %s\n", s);
Copied: trunk/tests/language-behaviour/IO/060-duplicate.check.sh (from rev 4602, trunk/tests/language-behaviour/060-duplicate.check.sh)
===================================================================
--- trunk/tests/language-behaviour/IO/060-duplicate.check.sh (rev 0)
+++ trunk/tests/language-behaviour/IO/060-duplicate.check.sh 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+grep 060-duplicate.in 060-duplicate.out || exit 1
+
+exit 0
Copied: trunk/tests/language-behaviour/IO/060-duplicate.clean.sh (from rev 4602, trunk/tests/language-behaviour/060-duplicate.clean.sh)
===================================================================
--- trunk/tests/language-behaviour/IO/060-duplicate.clean.sh (rev 0)
+++ trunk/tests/language-behaviour/IO/060-duplicate.clean.sh 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+rm -v 060-duplicate.in || exit 1
+rm -v 060-duplicate.out || exit 1
+
+exit 0
Copied: trunk/tests/language-behaviour/IO/060-duplicate.in (from rev 4602, trunk/tests/language-behaviour/060-duplicate.in)
===================================================================
--- trunk/tests/language-behaviour/IO/060-duplicate.in (rev 0)
+++ trunk/tests/language-behaviour/IO/060-duplicate.in 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+duplicatesource
Copied: trunk/tests/language-behaviour/IO/060-duplicate.out.expected (from rev 4602, trunk/tests/language-behaviour/060-duplicate.out.expected)
===================================================================
--- trunk/tests/language-behaviour/IO/060-duplicate.out.expected (rev 0)
+++ trunk/tests/language-behaviour/IO/060-duplicate.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+060-duplicate.in
Copied: trunk/tests/language-behaviour/IO/060-duplicate.setup.sh (from rev 4602, trunk/tests/language-behaviour/060-duplicate.setup.sh)
===================================================================
--- trunk/tests/language-behaviour/IO/060-duplicate.setup.sh (rev 0)
+++ trunk/tests/language-behaviour/IO/060-duplicate.setup.sh 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cp -v ${GROUP}/060-duplicate.in . || exit 1
+
+exit 0
Copied: trunk/tests/language-behaviour/IO/060-duplicate.swift (from rev 4602, trunk/tests/language-behaviour/060-duplicate.swift)
===================================================================
--- trunk/tests/language-behaviour/IO/060-duplicate.swift (rev 0)
+++ trunk/tests/language-behaviour/IO/060-duplicate.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,15 @@
+type file;
+
+
+file input <"060-duplicate.in">;
+
+file output <"060-duplicate.out">;
+
+(file t) echo(file m) {
+ app {
+ echo @filename(m) stdout=@filename(t);
+ }
+}
+
+output = echo(input);
+
Copied: trunk/tests/language-behaviour/IO/087-external-dataset.swift (from rev 4602, trunk/tests/language-behaviour/087-external-dataset.swift)
===================================================================
--- trunk/tests/language-behaviour/IO/087-external-dataset.swift (rev 0)
+++ trunk/tests/language-behaviour/IO/087-external-dataset.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,19 @@
+type file;
+
+(external o) a() {
+ app {
+ touch "foo";
+ }
+}
+
+b(external o) {
+ app {
+ touch "bar";
+ }
+}
+
+external sync;
+
+sync=a();
+b(sync);
+
Copied: trunk/tests/language-behaviour/IO/106-import.setup.sh (from rev 4602, trunk/tests/language-behaviour/106-import.setup.sh)
===================================================================
--- trunk/tests/language-behaviour/IO/106-import.setup.sh (rev 0)
+++ trunk/tests/language-behaviour/IO/106-import.setup.sh 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+cp -v ${GROUP}/testimport.swift . || exit 1
+cp -v ${GROUP}/testimport2.swift . || exit 1
+
+exit 0
Copied: trunk/tests/language-behaviour/IO/106-import.swift (from rev 4602, trunk/tests/language-behaviour/106-import.swift)
===================================================================
--- trunk/tests/language-behaviour/IO/106-import.swift (rev 0)
+++ trunk/tests/language-behaviour/IO/106-import.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,5 @@
+import "testimport";
+
+file f;
+
+int i = 6;
Copied: trunk/tests/language-behaviour/IO/130-fmri.0000.jpeg.expected (from rev 4602, trunk/tests/language-behaviour/130-fmri.0000.jpeg.expected)
===================================================================
Copied: trunk/tests/language-behaviour/IO/130-fmri.0001.h.in (from rev 4602, trunk/tests/language-behaviour/130-fmri.0001.h.in)
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.0001.h.in (rev 0)
+++ trunk/tests/language-behaviour/IO/130-fmri.0001.h.in 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+qux
Copied: trunk/tests/language-behaviour/IO/130-fmri.0001.jpeg.expected (from rev 4602, trunk/tests/language-behaviour/130-fmri.0001.jpeg.expected)
===================================================================
Copied: trunk/tests/language-behaviour/IO/130-fmri.0001.v.in (from rev 4602, trunk/tests/language-behaviour/130-fmri.0001.v.in)
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.0001.v.in (rev 0)
+++ trunk/tests/language-behaviour/IO/130-fmri.0001.v.in 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+qux
Copied: trunk/tests/language-behaviour/IO/130-fmri.0002.h.in (from rev 4602, trunk/tests/language-behaviour/130-fmri.0002.h.in)
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.0002.h.in (rev 0)
+++ trunk/tests/language-behaviour/IO/130-fmri.0002.h.in 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+qux
Copied: trunk/tests/language-behaviour/IO/130-fmri.0002.jpeg.expected (from rev 4602, trunk/tests/language-behaviour/130-fmri.0002.jpeg.expected)
===================================================================
Copied: trunk/tests/language-behaviour/IO/130-fmri.0002.v.in (from rev 4602, trunk/tests/language-behaviour/130-fmri.0002.v.in)
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.0002.v.in (rev 0)
+++ trunk/tests/language-behaviour/IO/130-fmri.0002.v.in 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+qux
Copied: trunk/tests/language-behaviour/IO/130-fmri.0003.h.in (from rev 4602, trunk/tests/language-behaviour/130-fmri.0003.h.in)
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.0003.h.in (rev 0)
+++ trunk/tests/language-behaviour/IO/130-fmri.0003.h.in 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+qux
Copied: trunk/tests/language-behaviour/IO/130-fmri.0003.v.in (from rev 4602, trunk/tests/language-behaviour/130-fmri.0003.v.in)
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.0003.v.in (rev 0)
+++ trunk/tests/language-behaviour/IO/130-fmri.0003.v.in 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+qux
Copied: trunk/tests/language-behaviour/IO/130-fmri.0004.h.in (from rev 4602, trunk/tests/language-behaviour/130-fmri.0004.h.in)
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.0004.h.in (rev 0)
+++ trunk/tests/language-behaviour/IO/130-fmri.0004.h.in 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+qux
Copied: trunk/tests/language-behaviour/IO/130-fmri.0004.v.in (from rev 4602, trunk/tests/language-behaviour/130-fmri.0004.v.in)
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.0004.v.in (rev 0)
+++ trunk/tests/language-behaviour/IO/130-fmri.0004.v.in 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+qux
Copied: trunk/tests/language-behaviour/IO/130-fmri.h.template (from rev 4602, trunk/tests/language-behaviour/130-fmri.h.template)
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.h.template (rev 0)
+++ trunk/tests/language-behaviour/IO/130-fmri.h.template 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+foo
Copied: trunk/tests/language-behaviour/IO/130-fmri.swift (from rev 4602, trunk/tests/language-behaviour/130-fmri.swift)
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.swift (rev 0)
+++ trunk/tests/language-behaviour/IO/130-fmri.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,78 @@
+
+# attempt to emulate the workflow patterns of the fMRI workflow that
+# I often fiddle with.
+
+type voxels;
+type header;
+
+type volume {
+ voxels v;
+ header h;
+ }
+
+type slice;
+
+type jpeg;
+
+
+// inputs: 4 volumes and a reference volume
+
+volume inputs[] <simple_mapper;prefix="130-fmri.",suffix=".in">;
+volume template <simple_mapper;prefix="130-fmri.",suffix=".template">;
+
+// align 4 volumes to reference volume
+
+volume aligned[];
+
+foreach inp, i in inputs {
+ aligned[i] = align(inputs[i], template);
+}
+
+(volume o) align(volume candidate, volume template) {
+ app {
+ touch @o.v @o.h;
+ }
+}
+
+// take average of all 4 (or 5?) volumes
+
+(volume avg) average(volume candidates[]) {
+ app {
+ touch @avg.v @avg.h;
+ }
+}
+
+volume brainatlas = average(aligned);
+
+// make 3 slices of the average volume, along x, y, z axes
+
+(slice s) slicer(volume atlas, string axis) {
+ app {
+ touch @s;
+ }
+}
+
+slice slices[];
+
+
+string axes[] = ["x", "y", "z"];
+foreach axis, i in axes {
+ slices[i] = slicer(brainatlas, axis);
+}
+
+// convert each slice into a jpeg
+
+jpeg final[] <simple_mapper;prefix="130-fmri.",suffix=".jpeg">;
+
+(jpeg j) convert(slice s) {
+ app {
+ touch @j;
+ }
+}
+
+foreach j,i in slices {
+ final[i] = convert(slices[i]);
+}
+
+// outputs: 3 jpegs
+
Copied: trunk/tests/language-behaviour/IO/130-fmri.v.template (from rev 4602, trunk/tests/language-behaviour/130-fmri.v.template)
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.v.template (rev 0)
+++ trunk/tests/language-behaviour/IO/130-fmri.v.template 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+foo
Copied: trunk/tests/language-behaviour/IO/761-dirname.swift (from rev 4602, trunk/tests/language-behaviour/761-dirname.swift)
===================================================================
--- trunk/tests/language-behaviour/IO/761-dirname.swift (rev 0)
+++ trunk/tests/language-behaviour/IO/761-dirname.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,9 @@
+
+type file{}
+
+file f<"/d/f.txt">;
+
+string s = @dirname(f);
+string t = @tostring(s);
+
+tracef("dirname: %s\n", s);
Added: trunk/tests/language-behaviour/IO/q2.swift
===================================================================
--- trunk/tests/language-behaviour/IO/q2.swift (rev 0)
+++ trunk/tests/language-behaviour/IO/q2.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,12 @@
+type messagefile {}
+
+(messagefile t) greeting (string s) {
+ app {
+ echo s stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"hello2.txt">;
+
+outfile = greeting("hello world");
+
Added: trunk/tests/language-behaviour/IO/q20.swift
===================================================================
--- trunk/tests/language-behaviour/IO/q20.swift (rev 0)
+++ trunk/tests/language-behaviour/IO/q20.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,18 @@
+type messagefile {}
+
+(messagefile t) greeting (string s) {
+ app {
+ echo s stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"hello20.txt">;
+
+boolean morning = true;
+
+if(morning) {
+ outfile = greeting("good morning");
+} else {
+ outfile = greeting("good afternoon");
+}
+
Added: trunk/tests/language-behaviour/IO/q21.swift
===================================================================
--- trunk/tests/language-behaviour/IO/q21.swift (rev 0)
+++ trunk/tests/language-behaviour/IO/q21.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,14 @@
+type messagefile {}
+
+(messagefile t) greeting (string s="hello") {
+ app {
+ echo s stdout=@filename(t);
+ }
+}
+
+messagefile english <"english2.txt">;
+messagefile french <"francais2.txt">;
+
+english = greeting();
+french = greeting(s="bonjour");
+
Added: trunk/tests/language-behaviour/IO/q22.swift
===================================================================
--- trunk/tests/language-behaviour/IO/q22.swift (rev 0)
+++ trunk/tests/language-behaviour/IO/q22.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,19 @@
+type messagefile {}
+type countfile {}
+
+(countfile t) countwords (messagefile f) {
+ app {
+ wc "-w" @filename(f) stdout=@filename(t);
+ }
+}
+
+string inputNames = "one.txt two.txt three.txt";
+string outputNames = "one.count two.count three.count";
+
+messagefile inputfiles[] <array_mapper;files=inputNames>;
+countfile outputfiles[] <array_mapper;files=outputNames>;
+
+outputfiles[0] = countwords(inputfiles[0]);
+outputfiles[1] = countwords(inputfiles[1]);
+outputfiles[2] = countwords(inputfiles[2]);
+
Added: trunk/tests/language-behaviour/IO/q23.swift
===================================================================
--- trunk/tests/language-behaviour/IO/q23.swift (rev 0)
+++ trunk/tests/language-behaviour/IO/q23.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,14 @@
+type messagefile {}
+
+(messagefile t) greeting (string s) {
+ app {
+ echo s stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"q23.txt">;
+
+string message = @arg("text");
+
+outfile = greeting(message);
+
Added: trunk/tests/language-behaviour/IO/q3.swift
===================================================================
--- trunk/tests/language-behaviour/IO/q3.swift (rev 0)
+++ trunk/tests/language-behaviour/IO/q3.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,10 @@
+type file {}
+
+(file t) echo (string s = "default greeting") {
+ app {
+ echo s stdout=@filename(t);
+ }
+}
+
+file hw = echo();
+
Added: trunk/tests/language-behaviour/IO/q5.swift
===================================================================
--- trunk/tests/language-behaviour/IO/q5.swift (rev 0)
+++ trunk/tests/language-behaviour/IO/q5.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,14 @@
+type messagefile {}
+
+(messagefile t) greeting (string s[]) {
+ app {
+ echo s[0] s[1] s[2] stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"q5out.txt">;
+
+string words[] = ["how","are","you"];
+
+outfile = greeting(words);
+
Added: trunk/tests/language-behaviour/IO/q6.swift
===================================================================
--- trunk/tests/language-behaviour/IO/q6.swift (rev 0)
+++ trunk/tests/language-behaviour/IO/q6.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,14 @@
+type file {}
+
+(file t) echo (string s) {
+ app {
+ echo s stdout=@filename(t);
+ }
+}
+
+string greetings[] = ["how","are","you"];
+
+foreach g in greetings {
+ file hw = echo(g);
+}
+
Added: trunk/tests/language-behaviour/IO/q7.swift
===================================================================
--- trunk/tests/language-behaviour/IO/q7.swift (rev 0)
+++ trunk/tests/language-behaviour/IO/q7.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,16 @@
+type file {}
+
+(file t) echo (string s) {
+ app {
+ echo s stdout=@filename(t);
+ }
+}
+
+string outputNames = "one two three";
+
+file outputFiles[] <array_mapper;files=outputNames>;
+
+foreach f in outputFiles {
+ f = echo("hello");
+}
+
Copied: trunk/tests/language-behaviour/IO/testimport.swift (from rev 4602, trunk/tests/language-behaviour/testimport.swift)
===================================================================
--- trunk/tests/language-behaviour/IO/testimport.swift (rev 0)
+++ trunk/tests/language-behaviour/IO/testimport.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,4 @@
+import "testimport2";
+
+type file;
+
Copied: trunk/tests/language-behaviour/IO/testimport2.swift (from rev 4602, trunk/tests/language-behaviour/testimport2.swift)
===================================================================
--- trunk/tests/language-behaviour/IO/testimport2.swift (rev 0)
+++ trunk/tests/language-behaviour/IO/testimport2.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,4 @@
+import "testimport";
+
+type F;
+
Copied: trunk/tests/language-behaviour/arithmetic/030-mix-float-int.out.expected (from rev 4602, trunk/tests/language-behaviour/030-mix-float-int.out.expected)
===================================================================
--- trunk/tests/language-behaviour/arithmetic/030-mix-float-int.out.expected (rev 0)
+++ trunk/tests/language-behaviour/arithmetic/030-mix-float-int.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+54.3
Copied: trunk/tests/language-behaviour/arithmetic/030-mix-float-int.swift (from rev 4602, trunk/tests/language-behaviour/030-mix-float-int.swift)
===================================================================
--- trunk/tests/language-behaviour/arithmetic/030-mix-float-int.swift (rev 0)
+++ trunk/tests/language-behaviour/arithmetic/030-mix-float-int.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,14 @@
+type messagefile {}
+
+(messagefile t) greeting(float m) {
+ app {
+ echo m stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"030-mix-float-int.out">;
+
+float f = 42.0 + 12.3;
+
+outfile = greeting(f);
+
Copied: trunk/tests/language-behaviour/arithmetic/031-add-float.out.expected (from rev 4602, trunk/tests/language-behaviour/031-add-float.out.expected)
===================================================================
--- trunk/tests/language-behaviour/arithmetic/031-add-float.out.expected (rev 0)
+++ trunk/tests/language-behaviour/arithmetic/031-add-float.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+135.3
Copied: trunk/tests/language-behaviour/arithmetic/031-add-float.swift (from rev 4602, trunk/tests/language-behaviour/031-add-float.swift)
===================================================================
--- trunk/tests/language-behaviour/arithmetic/031-add-float.swift (rev 0)
+++ trunk/tests/language-behaviour/arithmetic/031-add-float.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,14 @@
+type messagefile {}
+
+(messagefile t) greeting(float m) {
+ app {
+ echo m stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"031-add-float.out">;
+
+float i = 42.1+93.2;
+
+outfile = greeting(i);
+
Deleted: trunk/tests/language-behaviour/bug84-comparisons.out.expected
===================================================================
--- trunk/tests/language-behaviour/bug84-comparisons.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/bug84-comparisons.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-true
Deleted: trunk/tests/language-behaviour/bug84-comparisons.swift
===================================================================
--- trunk/tests/language-behaviour/bug84-comparisons.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/bug84-comparisons.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,12 +0,0 @@
-type messagefile {}
-
-(messagefile t) greeting(boolean b) {
- app {
- echo b stdout=@filename(t);
- }
-}
-
-messagefile outfile <"bug84-comparisons.out">;
-
-outfile = greeting(1 == 1);
-
Deleted: trunk/tests/language-behaviour/bug84-comparisons2.out.expected
===================================================================
--- trunk/tests/language-behaviour/bug84-comparisons2.out.expected 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/bug84-comparisons2.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-true
Deleted: trunk/tests/language-behaviour/bug84-comparisons2.swift
===================================================================
--- trunk/tests/language-behaviour/bug84-comparisons2.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/bug84-comparisons2.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,16 +0,0 @@
-type messagefile {}
-
-(messagefile t) greeting(boolean b) {
- app {
- echo b stdout=@filename(t);
- }
-}
-
-messagefile outfile <"bug84-comparisons2.out">;
-
-int i = 2;
-
-boolean r = i==2;
-
-outfile = greeting(r);
-
Copied: trunk/tests/language-behaviour/compounds/0024-compound.Q.out.expected (from rev 4602, trunk/tests/language-behaviour/0024-compound.Q.out.expected)
===================================================================
--- trunk/tests/language-behaviour/compounds/0024-compound.Q.out.expected (rev 0)
+++ trunk/tests/language-behaviour/compounds/0024-compound.Q.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+f
Copied: trunk/tests/language-behaviour/compounds/0024-compound.R.out.expected (from rev 4602, trunk/tests/language-behaviour/0024-compound.R.out.expected)
===================================================================
--- trunk/tests/language-behaviour/compounds/0024-compound.R.out.expected (rev 0)
+++ trunk/tests/language-behaviour/compounds/0024-compound.R.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+s
Copied: trunk/tests/language-behaviour/compounds/0024-compound.swift (from rev 4602, trunk/tests/language-behaviour/0024-compound.swift)
===================================================================
--- trunk/tests/language-behaviour/compounds/0024-compound.swift (rev 0)
+++ trunk/tests/language-behaviour/compounds/0024-compound.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,20 @@
+type messagefile {}
+
+(messagefile t) greeting(string m) {
+ app {
+ echo m stdout=@filename(t);
+ }
+}
+
+(messagefile first, messagefile second) compound() {
+ first = greeting("f");
+ second = greeting("s");
+
+}
+
+messagefile a <"0024-compound.Q.out">;
+messagefile b <"0024-compound.R.out">;
+
+(a,b) = compound();
+
+
Copied: trunk/tests/language-behaviour/compounds/00241-nested-single-compound.out.expected (from rev 4602, trunk/tests/language-behaviour/00241-nested-single-compound.out.expected)
===================================================================
--- trunk/tests/language-behaviour/compounds/00241-nested-single-compound.out.expected (rev 0)
+++ trunk/tests/language-behaviour/compounds/00241-nested-single-compound.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+f
Copied: trunk/tests/language-behaviour/compounds/00241-nested-single-compound.swift (from rev 4602, trunk/tests/language-behaviour/00241-nested-single-compound.swift)
===================================================================
--- trunk/tests/language-behaviour/compounds/00241-nested-single-compound.swift (rev 0)
+++ trunk/tests/language-behaviour/compounds/00241-nested-single-compound.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,21 @@
+type file;
+
+(file t) greeting(string m) {
+ app {
+ echo m stdout=@filename(t);
+ }
+}
+
+(file first) compound() {
+ first = greeting("f");
+}
+
+(file first) compoundB() {
+ first = compound();
+}
+
+file a <"00241-nested-single-compound.out">;
+
+a = compoundB();
+
+
Copied: trunk/tests/language-behaviour/compounds/00242-compound-with-vars.swift (from rev 4602, trunk/tests/language-behaviour/00242-compound-with-vars.swift)
===================================================================
--- trunk/tests/language-behaviour/compounds/00242-compound-with-vars.swift (rev 0)
+++ trunk/tests/language-behaviour/compounds/00242-compound-with-vars.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,20 @@
+type messagefile {}
+
+(messagefile t) greeting(string m) {
+ app {
+ echo m stdout=@filename(t);
+ }
+}
+
+(messagefile first, messagefile second) compound() {
+ string third="f";
+ first = greeting(third);
+ second = greeting("s");
+}
+
+messagefile a <"0024-compound.Q.out">;
+messagefile b <"0024-compound.R.out">;
+
+(a,b) = compound();
+
+
Copied: trunk/tests/language-behaviour/control_structures/090-case.out.expected (from rev 4602, trunk/tests/language-behaviour/090-case.out.expected)
===================================================================
--- trunk/tests/language-behaviour/control_structures/090-case.out.expected (rev 0)
+++ trunk/tests/language-behaviour/control_structures/090-case.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+eighth message
Copied: trunk/tests/language-behaviour/control_structures/090-case.swift (from rev 4602, trunk/tests/language-behaviour/090-case.swift)
===================================================================
--- trunk/tests/language-behaviour/control_structures/090-case.swift (rev 0)
+++ trunk/tests/language-behaviour/control_structures/090-case.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,27 @@
+type messagefile {}
+
+(messagefile t) greeting(string m) {
+ app {
+ echo m stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"090-case.out">;
+
+
+string message;
+
+switch(8) {
+ case 3:
+ message="first message";
+ case 8:
+ message="eighth message";
+ case 57:
+ message="last message";
+ default:
+ message="no message at all...";
+}
+
+trace(message);
+outfile = greeting(message);
+
Copied: trunk/tests/language-behaviour/control_structures/091-case.out.expected (from rev 4602, trunk/tests/language-behaviour/091-case.out.expected)
===================================================================
--- trunk/tests/language-behaviour/control_structures/091-case.out.expected (rev 0)
+++ trunk/tests/language-behaviour/control_structures/091-case.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+eighth message
Copied: trunk/tests/language-behaviour/control_structures/091-case.swift (from rev 4602, trunk/tests/language-behaviour/091-case.swift)
===================================================================
--- trunk/tests/language-behaviour/control_structures/091-case.swift (rev 0)
+++ trunk/tests/language-behaviour/control_structures/091-case.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,29 @@
+type messagefile {}
+
+(messagefile t) greeting(string m) {
+ app {
+ echo m stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"091-case.out">;
+
+int selector = 8;
+
+trace(selector);
+
+string message;
+
+switch(selector) {
+ case 3:
+ message="first message";
+ case 8:
+ message="eighth message";
+ case 57:
+ message="last message";
+ default:
+ message="no message at all...";
+}
+
+outfile = greeting(message);
+
Copied: trunk/tests/language-behaviour/control_structures/100-comparison.out.expected (from rev 4602, trunk/tests/language-behaviour/100-comparison.out.expected)
===================================================================
--- trunk/tests/language-behaviour/control_structures/100-comparison.out.expected (rev 0)
+++ trunk/tests/language-behaviour/control_structures/100-comparison.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+true
Copied: trunk/tests/language-behaviour/control_structures/100-comparison.swift (from rev 4602, trunk/tests/language-behaviour/100-comparison.swift)
===================================================================
--- trunk/tests/language-behaviour/control_structures/100-comparison.swift (rev 0)
+++ trunk/tests/language-behaviour/control_structures/100-comparison.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,14 @@
+type messagefile {}
+
+(messagefile t) greeting(boolean b) {
+ app {
+ echo b stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"100-comparison.out">;
+
+boolean r = 1==1;
+
+outfile = greeting(r);
+
Copied: trunk/tests/language-behaviour/control_structures/101-comparison-string.out.expected (from rev 4602, trunk/tests/language-behaviour/101-comparison-string.out.expected)
===================================================================
--- trunk/tests/language-behaviour/control_structures/101-comparison-string.out.expected (rev 0)
+++ trunk/tests/language-behaviour/control_structures/101-comparison-string.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+true
Copied: trunk/tests/language-behaviour/control_structures/101-comparison-string.swift (from rev 4602, trunk/tests/language-behaviour/101-comparison-string.swift)
===================================================================
--- trunk/tests/language-behaviour/control_structures/101-comparison-string.swift (rev 0)
+++ trunk/tests/language-behaviour/control_structures/101-comparison-string.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,16 @@
+type messagefile {}
+
+(messagefile t) greeting(boolean b) {
+ app {
+ echo b stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"101-comparison-string.out">;
+
+string s = "hello";
+
+boolean r = s=="hello";
+
+outfile = greeting(r);
+
Copied: trunk/tests/language-behaviour/control_structures/105-if.out.expected (from rev 4602, trunk/tests/language-behaviour/105-if.out.expected)
===================================================================
--- trunk/tests/language-behaviour/control_structures/105-if.out.expected (rev 0)
+++ trunk/tests/language-behaviour/control_structures/105-if.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+hello
Copied: trunk/tests/language-behaviour/control_structures/105-if.swift (from rev 4602, trunk/tests/language-behaviour/105-if.swift)
===================================================================
--- trunk/tests/language-behaviour/control_structures/105-if.swift (rev 0)
+++ trunk/tests/language-behaviour/control_structures/105-if.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,16 @@
+type messagefile;
+
+(messagefile t) greeting() {
+ app {
+ echo "hello" stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"105-if.out">;
+
+boolean b = 1==1;
+
+if(b) {
+ outfile = greeting();
+}
+
Copied: trunk/tests/language-behaviour/control_structures/bug84-comparisons.out.expected (from rev 4602, trunk/tests/language-behaviour/bug84-comparisons.out.expected)
===================================================================
--- trunk/tests/language-behaviour/control_structures/bug84-comparisons.out.expected (rev 0)
+++ trunk/tests/language-behaviour/control_structures/bug84-comparisons.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+true
Copied: trunk/tests/language-behaviour/control_structures/bug84-comparisons.swift (from rev 4602, trunk/tests/language-behaviour/bug84-comparisons.swift)
===================================================================
--- trunk/tests/language-behaviour/control_structures/bug84-comparisons.swift (rev 0)
+++ trunk/tests/language-behaviour/control_structures/bug84-comparisons.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,12 @@
+type messagefile {}
+
+(messagefile t) greeting(boolean b) {
+ app {
+ echo b stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"bug84-comparisons.out">;
+
+outfile = greeting(1 == 1);
+
Copied: trunk/tests/language-behaviour/control_structures/bug84-comparisons2.out.expected (from rev 4602, trunk/tests/language-behaviour/bug84-comparisons2.out.expected)
===================================================================
--- trunk/tests/language-behaviour/control_structures/bug84-comparisons2.out.expected (rev 0)
+++ trunk/tests/language-behaviour/control_structures/bug84-comparisons2.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+true
Copied: trunk/tests/language-behaviour/control_structures/bug84-comparisons2.swift (from rev 4602, trunk/tests/language-behaviour/bug84-comparisons2.swift)
===================================================================
--- trunk/tests/language-behaviour/control_structures/bug84-comparisons2.swift (rev 0)
+++ trunk/tests/language-behaviour/control_structures/bug84-comparisons2.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,16 @@
+type messagefile {}
+
+(messagefile t) greeting(boolean b) {
+ app {
+ echo b stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"bug84-comparisons2.out">;
+
+int i = 2;
+
+boolean r = i==2;
+
+outfile = greeting(r);
+
Copied: trunk/tests/language-behaviour/datatypes/0231-complex-type.out.expected (from rev 4602, trunk/tests/language-behaviour/0231-complex-type.out.expected)
===================================================================
--- trunk/tests/language-behaviour/datatypes/0231-complex-type.out.expected (rev 0)
+++ trunk/tests/language-behaviour/datatypes/0231-complex-type.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+3 44
Copied: trunk/tests/language-behaviour/datatypes/0231-complex-type.swift (from rev 4602, trunk/tests/language-behaviour/0231-complex-type.swift)
===================================================================
--- trunk/tests/language-behaviour/datatypes/0231-complex-type.swift (rev 0)
+++ trunk/tests/language-behaviour/datatypes/0231-complex-type.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,21 @@
+type messagefile {}
+
+type mystruct {
+ int first, second;
+}
+
+(messagefile t) greeting(mystruct m) {
+ app {
+ echo m.first m.second stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"0231-complex-type.out">;
+
+mystruct m;
+
+m.first = 3;
+m.second = 44;
+
+outfile = greeting(m);
+
Copied: trunk/tests/language-behaviour/datatypes/027-single-character-typename.swift (from rev 4602, trunk/tests/language-behaviour/027-single-character-typename.swift)
===================================================================
--- trunk/tests/language-behaviour/datatypes/027-single-character-typename.swift (rev 0)
+++ trunk/tests/language-behaviour/datatypes/027-single-character-typename.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,3 @@
+type q;
+q i;
+
Copied: trunk/tests/language-behaviour/datatypes/028-double-character-typename.swift (from rev 4602, trunk/tests/language-behaviour/028-double-character-typename.swift)
===================================================================
--- trunk/tests/language-behaviour/datatypes/028-double-character-typename.swift (rev 0)
+++ trunk/tests/language-behaviour/datatypes/028-double-character-typename.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,4 @@
+type qq;
+
+qq i;
+
Copied: trunk/tests/language-behaviour/datatypes/032-boolconst.f.out.expected (from rev 4602, trunk/tests/language-behaviour/032-boolconst.f.out.expected)
===================================================================
--- trunk/tests/language-behaviour/datatypes/032-boolconst.f.out.expected (rev 0)
+++ trunk/tests/language-behaviour/datatypes/032-boolconst.f.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+false
Copied: trunk/tests/language-behaviour/datatypes/032-boolconst.swift (from rev 4602, trunk/tests/language-behaviour/032-boolconst.swift)
===================================================================
--- trunk/tests/language-behaviour/datatypes/032-boolconst.swift (rev 0)
+++ trunk/tests/language-behaviour/datatypes/032-boolconst.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,14 @@
+type messagefile;
+
+(messagefile t) p(boolean b) {
+ app {
+ echo b stdout=@filename(t);
+ }
+}
+
+messagefile tfile <"032-boolconst.t.out">;
+messagefile ffile <"032-boolconst.f.out">;
+
+tfile = p(true);
+ffile = p(false);
+
Copied: trunk/tests/language-behaviour/datatypes/032-boolconst.t.out.expected (from rev 4602, trunk/tests/language-behaviour/032-boolconst.t.out.expected)
===================================================================
--- trunk/tests/language-behaviour/datatypes/032-boolconst.t.out.expected (rev 0)
+++ trunk/tests/language-behaviour/datatypes/032-boolconst.t.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+true
Copied: trunk/tests/language-behaviour/datatypes/053-pass-int.out.expected (from rev 4602, trunk/tests/language-behaviour/053-pass-int.out.expected)
===================================================================
--- trunk/tests/language-behaviour/datatypes/053-pass-int.out.expected (rev 0)
+++ trunk/tests/language-behaviour/datatypes/053-pass-int.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+7
Copied: trunk/tests/language-behaviour/datatypes/053-pass-int.swift (from rev 4602, trunk/tests/language-behaviour/053-pass-int.swift)
===================================================================
--- trunk/tests/language-behaviour/datatypes/053-pass-int.swift (rev 0)
+++ trunk/tests/language-behaviour/datatypes/053-pass-int.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,12 @@
+type messagefile {}
+
+(messagefile t) greeting(string m, int i) {
+ app {
+ echo i stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"053-pass-int.out">;
+
+outfile = greeting("hi", 7);
+
Copied: trunk/tests/language-behaviour/datatypes/054-pass-int.out.expected (from rev 4602, trunk/tests/language-behaviour/054-pass-int.out.expected)
===================================================================
--- trunk/tests/language-behaviour/datatypes/054-pass-int.out.expected (rev 0)
+++ trunk/tests/language-behaviour/datatypes/054-pass-int.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+99
Copied: trunk/tests/language-behaviour/datatypes/054-pass-int.swift (from rev 4602, trunk/tests/language-behaviour/054-pass-int.swift)
===================================================================
--- trunk/tests/language-behaviour/datatypes/054-pass-int.swift (rev 0)
+++ trunk/tests/language-behaviour/datatypes/054-pass-int.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,14 @@
+type messagefile {}
+
+(messagefile t) greeting(string m, int i) {
+ app {
+ echo i stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"054-pass-int.out">;
+
+int luftballons = 99;
+
+outfile = greeting("hi", luftballons);
+
Copied: trunk/tests/language-behaviour/datatypes/055-pass-int.out.expected (from rev 4602, trunk/tests/language-behaviour/055-pass-int.out.expected)
===================================================================
--- trunk/tests/language-behaviour/datatypes/055-pass-int.out.expected (rev 0)
+++ trunk/tests/language-behaviour/datatypes/055-pass-int.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+99
Copied: trunk/tests/language-behaviour/datatypes/055-pass-int.swift (from rev 4602, trunk/tests/language-behaviour/055-pass-int.swift)
===================================================================
--- trunk/tests/language-behaviour/datatypes/055-pass-int.swift (rev 0)
+++ trunk/tests/language-behaviour/datatypes/055-pass-int.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,16 @@
+type messagefile {}
+
+(messagefile t) greeting(string m, int i) {
+ app {
+ echo i stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"055-pass-int.out">;
+
+int luftballons;
+
+luftballons = 99;
+
+outfile = greeting("hi", luftballons);
+
Copied: trunk/tests/language-behaviour/datatypes/regress-r2292.swift (from rev 4602, trunk/tests/language-behaviour/regress-r2292.swift)
===================================================================
--- trunk/tests/language-behaviour/datatypes/regress-r2292.swift (rev 0)
+++ trunk/tests/language-behaviour/datatypes/regress-r2292.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+type row { int column[]; }
Copied: trunk/tests/language-behaviour/logic/033-and.ff.out.expected (from rev 4602, trunk/tests/language-behaviour/033-and.ff.out.expected)
===================================================================
--- trunk/tests/language-behaviour/logic/033-and.ff.out.expected (rev 0)
+++ trunk/tests/language-behaviour/logic/033-and.ff.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+false
Copied: trunk/tests/language-behaviour/logic/033-and.ft.out.expected (from rev 4602, trunk/tests/language-behaviour/033-and.ft.out.expected)
===================================================================
--- trunk/tests/language-behaviour/logic/033-and.ft.out.expected (rev 0)
+++ trunk/tests/language-behaviour/logic/033-and.ft.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+false
Copied: trunk/tests/language-behaviour/logic/033-and.swift (from rev 4602, trunk/tests/language-behaviour/033-and.swift)
===================================================================
--- trunk/tests/language-behaviour/logic/033-and.swift (rev 0)
+++ trunk/tests/language-behaviour/logic/033-and.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,18 @@
+type messagefile;
+
+(messagefile t) p(boolean b) {
+ app {
+ echo b stdout=@filename(t);
+ }
+}
+
+messagefile fffile <"033-and.ff.out">;
+messagefile ftfile <"033-and.ft.out">;
+messagefile tffile <"033-and.tf.out">;
+messagefile ttfile <"033-and.tt.out">;
+
+fffile = p(false && false);
+ftfile = p(false && true);
+tffile = p(true && false);
+ttfile = p(true && true);
+
Copied: trunk/tests/language-behaviour/logic/033-and.tf.out.expected (from rev 4602, trunk/tests/language-behaviour/033-and.tf.out.expected)
===================================================================
--- trunk/tests/language-behaviour/logic/033-and.tf.out.expected (rev 0)
+++ trunk/tests/language-behaviour/logic/033-and.tf.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+false
Copied: trunk/tests/language-behaviour/logic/033-and.tt.out.expected (from rev 4602, trunk/tests/language-behaviour/033-and.tt.out.expected)
===================================================================
--- trunk/tests/language-behaviour/logic/033-and.tt.out.expected (rev 0)
+++ trunk/tests/language-behaviour/logic/033-and.tt.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+true
Copied: trunk/tests/language-behaviour/logic/034-or.ff.out.expected (from rev 4602, trunk/tests/language-behaviour/034-or.ff.out.expected)
===================================================================
--- trunk/tests/language-behaviour/logic/034-or.ff.out.expected (rev 0)
+++ trunk/tests/language-behaviour/logic/034-or.ff.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+false
Copied: trunk/tests/language-behaviour/logic/034-or.ft.out.expected (from rev 4602, trunk/tests/language-behaviour/034-or.ft.out.expected)
===================================================================
--- trunk/tests/language-behaviour/logic/034-or.ft.out.expected (rev 0)
+++ trunk/tests/language-behaviour/logic/034-or.ft.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+true
Copied: trunk/tests/language-behaviour/logic/034-or.swift (from rev 4602, trunk/tests/language-behaviour/034-or.swift)
===================================================================
--- trunk/tests/language-behaviour/logic/034-or.swift (rev 0)
+++ trunk/tests/language-behaviour/logic/034-or.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,18 @@
+type messagefile;
+
+(messagefile t) p(boolean b) {
+ app {
+ echo b stdout=@filename(t);
+ }
+}
+
+messagefile fffile <"034-or.ff.out">;
+messagefile ftfile <"034-or.ft.out">;
+messagefile tffile <"034-or.tf.out">;
+messagefile ttfile <"034-or.tt.out">;
+
+fffile = p(false || false);
+ftfile = p(false || true);
+tffile = p(true || false);
+ttfile = p(true || true);
+
Copied: trunk/tests/language-behaviour/logic/034-or.tf.out.expected (from rev 4602, trunk/tests/language-behaviour/034-or.tf.out.expected)
===================================================================
--- trunk/tests/language-behaviour/logic/034-or.tf.out.expected (rev 0)
+++ trunk/tests/language-behaviour/logic/034-or.tf.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+true
Copied: trunk/tests/language-behaviour/logic/034-or.tt.out.expected (from rev 4602, trunk/tests/language-behaviour/034-or.tt.out.expected)
===================================================================
--- trunk/tests/language-behaviour/logic/034-or.tt.out.expected (rev 0)
+++ trunk/tests/language-behaviour/logic/034-or.tt.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+true
Copied: trunk/tests/language-behaviour/logic/035-not.swift (from rev 4602, trunk/tests/language-behaviour/035-not.swift)
===================================================================
--- trunk/tests/language-behaviour/logic/035-not.swift (rev 0)
+++ trunk/tests/language-behaviour/logic/035-not.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,14 @@
+type messagefile;
+
+(messagefile t) p(boolean b) {
+ app {
+ echo b stdout=@filename(t);
+ }
+}
+
+messagefile tfile <"035-not.t.out">;
+messagefile ffile <"035-not.f.out">;
+
+tfile = p(!true);
+ffile = p(!false);
+
Deleted: trunk/tests/language-behaviour/proc-in-expr.swift
===================================================================
--- trunk/tests/language-behaviour/proc-in-expr.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/proc-in-expr.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,10 +0,0 @@
-
-(int r) mynum(int p) {
- r = p;
-}
-
-int x = mynum(3);
-
-trace(x);
-
-
Copied: trunk/tests/language-behaviour/procedures/0026-function-param.swift (from rev 4602, trunk/tests/language-behaviour/0026-function-param.swift)
===================================================================
--- trunk/tests/language-behaviour/procedures/0026-function-param.swift (rev 0)
+++ trunk/tests/language-behaviour/procedures/0026-function-param.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,7 @@
+(int r) add(int a, int b) {
+ r = a + b;
+}
+
+trace(add(1, 1));
+
+trace(add(add(1, 1), add(2, 2)));
Copied: trunk/tests/language-behaviour/procedures/00261-function-param-file.clean.sh (from rev 4602, trunk/tests/language-behaviour/00261-function-param-file.clean.sh)
===================================================================
--- trunk/tests/language-behaviour/procedures/00261-function-param-file.clean.sh (rev 0)
+++ trunk/tests/language-behaviour/procedures/00261-function-param-file.clean.sh 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+rm -v 00261-function-param-file.in || exit 1
+
+exit 0
Copied: trunk/tests/language-behaviour/procedures/00261-function-param-file.in (from rev 4602, trunk/tests/language-behaviour/00261-function-param-file.in)
===================================================================
--- trunk/tests/language-behaviour/procedures/00261-function-param-file.in (rev 0)
+++ trunk/tests/language-behaviour/procedures/00261-function-param-file.in 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,4 @@
+a
+b
+c
+d
Copied: trunk/tests/language-behaviour/procedures/00261-function-param-file.setup.sh (from rev 4602, trunk/tests/language-behaviour/00261-function-param-file.setup.sh)
===================================================================
--- trunk/tests/language-behaviour/procedures/00261-function-param-file.setup.sh (rev 0)
+++ trunk/tests/language-behaviour/procedures/00261-function-param-file.setup.sh 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cp -v ${GROUP}/00261-function-param-file.in . || exit 1
+
+exit 0
Copied: trunk/tests/language-behaviour/procedures/00261-function-param-file.swift (from rev 4602, trunk/tests/language-behaviour/00261-function-param-file.swift)
===================================================================
--- trunk/tests/language-behaviour/procedures/00261-function-param-file.swift (rev 0)
+++ trunk/tests/language-behaviour/procedures/00261-function-param-file.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,14 @@
+type file;
+
+app (file editedParams) setTemps ( file inParams )
+{
+cat stdin=@inParams stdout=@editedParams;
+}
+
+file inParams<single_file_mapper; file="00261-function-param-file.in" >;
+
+string config [] = readData( setTemps(inParams ) );
+
+trace(0,config[0]);
+trace(1,config[1]);
+
Copied: trunk/tests/language-behaviour/procedures/00262-function-param-file-many.clean.sh (from rev 4602, trunk/tests/language-behaviour/00262-function-param-file-many.clean.sh)
===================================================================
--- trunk/tests/language-behaviour/procedures/00262-function-param-file-many.clean.sh (rev 0)
+++ trunk/tests/language-behaviour/procedures/00262-function-param-file-many.clean.sh 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+rm -v 00262-function-param-file-many.in || exit 1
+
+exit 0
Copied: trunk/tests/language-behaviour/procedures/00262-function-param-file-many.in (from rev 4602, trunk/tests/language-behaviour/00262-function-param-file-many.in)
===================================================================
--- trunk/tests/language-behaviour/procedures/00262-function-param-file-many.in (rev 0)
+++ trunk/tests/language-behaviour/procedures/00262-function-param-file-many.in 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,4 @@
+a
+b
+c
+d
Copied: trunk/tests/language-behaviour/procedures/00262-function-param-file-many.setup.sh (from rev 4602, trunk/tests/language-behaviour/00262-function-param-file-many.setup.sh)
===================================================================
--- trunk/tests/language-behaviour/procedures/00262-function-param-file-many.setup.sh (rev 0)
+++ trunk/tests/language-behaviour/procedures/00262-function-param-file-many.setup.sh 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cp -v ${GROUP}/00262-function-param-file-many.in . || exit 1
+
+exit 0
Copied: trunk/tests/language-behaviour/procedures/00262-function-param-file-many.swift (from rev 4602, trunk/tests/language-behaviour/00262-function-param-file-many.swift)
===================================================================
--- trunk/tests/language-behaviour/procedures/00262-function-param-file-many.swift (rev 0)
+++ trunk/tests/language-behaviour/procedures/00262-function-param-file-many.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,14 @@
+type file;
+
+app (file editedParams) cat ( file inParams )
+{
+cat stdin=@inParams stdout=@editedParams;
+}
+
+file inParams<single_file_mapper; file="00262-function-param-file-many.in" >;
+
+string config [] = readData( cat(cat(cat(inParams ) )));
+
+trace(0,config[0]);
+trace(1,config[1]);
+
Copied: trunk/tests/language-behaviour/procedures/080-declare-assign-proc.swift (from rev 4602, trunk/tests/language-behaviour/080-declare-assign-proc.swift)
===================================================================
--- trunk/tests/language-behaviour/procedures/080-declare-assign-proc.swift (rev 0)
+++ trunk/tests/language-behaviour/procedures/080-declare-assign-proc.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,12 @@
+type messagefile {}
+
+(messagefile t) greeting() {
+ app {
+ echo "hello" stdout=@filename(t);
+ }
+}
+
+messagefile outfile = greeting();
+
+// can't check the output in present framework because don't know
+// what filename got chosen for outfile...
Copied: trunk/tests/language-behaviour/procedures/081-declare-assign-proc.swift (from rev 4602, trunk/tests/language-behaviour/081-declare-assign-proc.swift)
===================================================================
--- trunk/tests/language-behaviour/procedures/081-declare-assign-proc.swift (rev 0)
+++ trunk/tests/language-behaviour/procedures/081-declare-assign-proc.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,12 @@
+type messagefile {}
+
+(messagefile t) greeting(int i) {
+ app {
+ echo i stdout=@filename(t);
+ }
+}
+
+messagefile outfile = greeting(3 + 2);
+
+// can't check the output in present framework because don't know
+// what filename got chosen for outfile...
Copied: trunk/tests/language-behaviour/procedures/082-declare-assign-proc-separate.swift (from rev 4602, trunk/tests/language-behaviour/082-declare-assign-proc-separate.swift)
===================================================================
--- trunk/tests/language-behaviour/procedures/082-declare-assign-proc-separate.swift (rev 0)
+++ trunk/tests/language-behaviour/procedures/082-declare-assign-proc-separate.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,13 @@
+type messagefile {}
+
+(messagefile t) greeting() {
+ app {
+ echo "hello" stdout=@filename(t);
+ }
+}
+
+messagefile outfile;
+outfile = greeting();
+
+// can't check the output in present framework because don't know
+// what filename got chosen for outfile...
Copied: trunk/tests/language-behaviour/procedures/089-nested-proc-call.swift (from rev 4602, trunk/tests/language-behaviour/089-nested-proc-call.swift)
===================================================================
--- trunk/tests/language-behaviour/procedures/089-nested-proc-call.swift (rev 0)
+++ trunk/tests/language-behaviour/procedures/089-nested-proc-call.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,21 @@
+type messagefile;
+
+(messagefile t) inner_greeting() {
+ app {
+ echo "hello" stdout=@filename(t);
+ }
+}
+
+(string s) outer_greeting() {
+ messagefile m <"ssss">;
+ m = inner_greeting();
+ s = readData(m);
+}
+
+
+// messagefile outfile <"089-nested-proc-call.swift">;
+
+// outfile = greeting();
+
+trace(outer_greeting());
+
Copied: trunk/tests/language-behaviour/procedures/proc-in-expr.swift (from rev 4602, trunk/tests/language-behaviour/proc-in-expr.swift)
===================================================================
--- trunk/tests/language-behaviour/procedures/proc-in-expr.swift (rev 0)
+++ trunk/tests/language-behaviour/procedures/proc-in-expr.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,10 @@
+
+(int r) mynum(int p) {
+ r = p;
+}
+
+int x = mynum(3);
+
+trace(x);
+
+
Deleted: trunk/tests/language-behaviour/regress-r2292.swift
===================================================================
--- trunk/tests/language-behaviour/regress-r2292.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/regress-r2292.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +0,0 @@
-type row { int column[]; }
Copied: trunk/tests/language-behaviour/strings/003-strcat.out.expected (from rev 4602, trunk/tests/language-behaviour/003-strcat.out.expected)
===================================================================
--- trunk/tests/language-behaviour/strings/003-strcat.out.expected (rev 0)
+++ trunk/tests/language-behaviour/strings/003-strcat.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+abcqux
Copied: trunk/tests/language-behaviour/strings/003-strcat.swift (from rev 4602, trunk/tests/language-behaviour/003-strcat.swift)
===================================================================
--- trunk/tests/language-behaviour/strings/003-strcat.swift (rev 0)
+++ trunk/tests/language-behaviour/strings/003-strcat.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,15 @@
+type messagefile {}
+
+(messagefile t) greeting(string m) {
+ app {
+ echo m stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"003-strcat.out">;
+
+string v = @strcat("abc","qux");
+
+outfile = greeting(v);
+
+
Copied: trunk/tests/language-behaviour/strings/0031-strcat-op.out.expected (from rev 4602, trunk/tests/language-behaviour/0031-strcat-op.out.expected)
===================================================================
--- trunk/tests/language-behaviour/strings/0031-strcat-op.out.expected (rev 0)
+++ trunk/tests/language-behaviour/strings/0031-strcat-op.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+abc,qux
Copied: trunk/tests/language-behaviour/strings/0031-strcat-op.swift (from rev 4602, trunk/tests/language-behaviour/0031-strcat-op.swift)
===================================================================
--- trunk/tests/language-behaviour/strings/0031-strcat-op.swift (rev 0)
+++ trunk/tests/language-behaviour/strings/0031-strcat-op.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,18 @@
+type messagefile {}
+
+(messagefile t) greeting(string m) {
+ app {
+ echo m stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"0031-strcat-op.out">;
+
+string a = "abc";
+string b = "qux";
+
+string v = a + "," + b;
+
+outfile = greeting(v);
+
+
Copied: trunk/tests/language-behaviour/strings/004-strcat-in-arg.out.expected (from rev 4602, trunk/tests/language-behaviour/004-strcat-in-arg.out.expected)
===================================================================
--- trunk/tests/language-behaviour/strings/004-strcat-in-arg.out.expected (rev 0)
+++ trunk/tests/language-behaviour/strings/004-strcat-in-arg.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+test004append
Copied: trunk/tests/language-behaviour/strings/004-strcat-in-arg.swift (from rev 4602, trunk/tests/language-behaviour/004-strcat-in-arg.swift)
===================================================================
--- trunk/tests/language-behaviour/strings/004-strcat-in-arg.swift (rev 0)
+++ trunk/tests/language-behaviour/strings/004-strcat-in-arg.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,13 @@
+type messagefile {}
+
+(messagefile t) greeting(string m) {
+ app {
+ echo m stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"004-strcat-in-arg.out">;
+
+outfile = greeting(@strcat("test004","append"));
+
+
Copied: trunk/tests/language-behaviour/strings/005-strcut.out.expected (from rev 4602, trunk/tests/language-behaviour/005-strcut.out.expected)
===================================================================
--- trunk/tests/language-behaviour/strings/005-strcut.out.expected (rev 0)
+++ trunk/tests/language-behaviour/strings/005-strcut.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+def
Copied: trunk/tests/language-behaviour/strings/005-strcut.swift (from rev 4602, trunk/tests/language-behaviour/005-strcut.swift)
===================================================================
--- trunk/tests/language-behaviour/strings/005-strcut.swift (rev 0)
+++ trunk/tests/language-behaviour/strings/005-strcut.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,14 @@
+type messagefile {}
+
+(messagefile t) greeting(string m) {
+ app {
+ echo m stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"005-strcut.out">;
+
+string v = @strcut("abcdefghi", "abc(def)ghi");
+
+outfile = greeting(v);
+
Copied: trunk/tests/language-behaviour/strings/0051-regexp.out.expected (from rev 4602, trunk/tests/language-behaviour/0051-regexp.out.expected)
===================================================================
--- trunk/tests/language-behaviour/strings/0051-regexp.out.expected (rev 0)
+++ trunk/tests/language-behaviour/strings/0051-regexp.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+monkey
Copied: trunk/tests/language-behaviour/strings/0051-regexp.swift (from rev 4602, trunk/tests/language-behaviour/0051-regexp.swift)
===================================================================
--- trunk/tests/language-behaviour/strings/0051-regexp.swift (rev 0)
+++ trunk/tests/language-behaviour/strings/0051-regexp.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,14 @@
+type messagefile {}
+
+(messagefile t) greeting(string m) {
+ app {
+ echo m stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"0051-regexp.out">;
+
+string v = @regexp("abcdefghi", "abc(def)ghi","monkey");
+
+outfile = greeting(v);
+
Copied: trunk/tests/language-behaviour/strings/0052-regexp.out.expected (from rev 4602, trunk/tests/language-behaviour/0052-regexp.out.expected)
===================================================================
--- trunk/tests/language-behaviour/strings/0052-regexp.out.expected (rev 0)
+++ trunk/tests/language-behaviour/strings/0052-regexp.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+abmonkeyhi
Copied: trunk/tests/language-behaviour/strings/0052-regexp.swift (from rev 4602, trunk/tests/language-behaviour/0052-regexp.swift)
===================================================================
--- trunk/tests/language-behaviour/strings/0052-regexp.swift (rev 0)
+++ trunk/tests/language-behaviour/strings/0052-regexp.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,14 @@
+type messagefile {}
+
+(messagefile t) greeting(string m) {
+ app {
+ echo m stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"0052-regexp.out">;
+
+string v = @regexp("abcdefghi", "c(def)g","monkey");
+
+outfile = greeting(v);
+
Copied: trunk/tests/language-behaviour/strings/0053-toint.out.expected (from rev 4602, trunk/tests/language-behaviour/0053-toint.out.expected)
===================================================================
--- trunk/tests/language-behaviour/strings/0053-toint.out.expected (rev 0)
+++ trunk/tests/language-behaviour/strings/0053-toint.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+109
Copied: trunk/tests/language-behaviour/strings/0053-toint.swift (from rev 4602, trunk/tests/language-behaviour/0053-toint.swift)
===================================================================
--- trunk/tests/language-behaviour/strings/0053-toint.swift (rev 0)
+++ trunk/tests/language-behaviour/strings/0053-toint.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,15 @@
+type messagefile;
+
+(messagefile t) greeting(int m) {
+ app {
+ echo m stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"0053-toint.out">;
+
+string left = "010";
+string right = "99";
+
+outfile = greeting(@toint(left) + @toint(right));
+
Copied: trunk/tests/language-behaviour/strings/0054-strsplit.out.expected (from rev 4602, trunk/tests/language-behaviour/0054-strsplit.out.expected)
===================================================================
--- trunk/tests/language-behaviour/strings/0054-strsplit.out.expected (rev 0)
+++ trunk/tests/language-behaviour/strings/0054-strsplit.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+ab , c , def , ghij
Copied: trunk/tests/language-behaviour/strings/0054-strsplit.swift (from rev 4602, trunk/tests/language-behaviour/0054-strsplit.swift)
===================================================================
--- trunk/tests/language-behaviour/strings/0054-strsplit.swift (rev 0)
+++ trunk/tests/language-behaviour/strings/0054-strsplit.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,14 @@
+type messagefile {}
+
+(messagefile t) greeting(string a, string b, string c, string d) {
+ app {
+ echo a "," b "," c "," d stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"0054-strsplit.out">;
+
+string s[] = @strsplit("ab c def ghij", "\\s");
+
+outfile = greeting(s[0], s[1], s[2], s[3]);
+
Copied: trunk/tests/language-behaviour/strings/103-quote.out.expected (from rev 4602, trunk/tests/language-behaviour/103-quote.out.expected)
===================================================================
--- trunk/tests/language-behaviour/strings/103-quote.out.expected (rev 0)
+++ trunk/tests/language-behaviour/strings/103-quote.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+"
Copied: trunk/tests/language-behaviour/strings/103-quote.swift (from rev 4602, trunk/tests/language-behaviour/103-quote.swift)
===================================================================
--- trunk/tests/language-behaviour/strings/103-quote.swift (rev 0)
+++ trunk/tests/language-behaviour/strings/103-quote.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,12 @@
+type messagefile;
+
+(messagefile t) greeting() {
+ app {
+ echo "\"" stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"103-quote.out">;
+
+outfile = greeting();
+
Copied: trunk/tests/language-behaviour/strings/1031-quote.swift (from rev 4602, trunk/tests/language-behaviour/1031-quote.swift)
===================================================================
--- trunk/tests/language-behaviour/strings/1031-quote.swift (rev 0)
+++ trunk/tests/language-behaviour/strings/1031-quote.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,12 @@
+type messagefile;
+
+(messagefile t) greeting() {
+ app {
+ echo "testing \"quotes\" in swift" stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"1031-quote.out">;
+
+outfile = greeting();
+
Copied: trunk/tests/language-behaviour/strings/1032-singlequote.out.expected (from rev 4602, trunk/tests/language-behaviour/1032-singlequote.out.expected)
===================================================================
--- trunk/tests/language-behaviour/strings/1032-singlequote.out.expected (rev 0)
+++ trunk/tests/language-behaviour/strings/1032-singlequote.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+testing 'quotes' in swift
Copied: trunk/tests/language-behaviour/strings/1032-singlequote.swift (from rev 4602, trunk/tests/language-behaviour/1032-singlequote.swift)
===================================================================
--- trunk/tests/language-behaviour/strings/1032-singlequote.swift (rev 0)
+++ trunk/tests/language-behaviour/strings/1032-singlequote.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,12 @@
+type messagefile;
+
+(messagefile t) greeting() {
+ app {
+ echo "testing 'quotes' in swift" stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"1032-singlequote.out">;
+
+outfile = greeting();
+
Copied: trunk/tests/language-behaviour/strings/1033-singlequote.out.expected (from rev 4602, trunk/tests/language-behaviour/1033-singlequote.out.expected)
===================================================================
--- trunk/tests/language-behaviour/strings/1033-singlequote.out.expected (rev 0)
+++ trunk/tests/language-behaviour/strings/1033-singlequote.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+'
Copied: trunk/tests/language-behaviour/strings/1033-singlequote.swift (from rev 4602, trunk/tests/language-behaviour/1033-singlequote.swift)
===================================================================
--- trunk/tests/language-behaviour/strings/1033-singlequote.swift (rev 0)
+++ trunk/tests/language-behaviour/strings/1033-singlequote.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,12 @@
+type messagefile;
+
+(messagefile t) greeting() {
+ app {
+ echo "'" stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"1033-singlequote.out">;
+
+outfile = greeting();
+
Copied: trunk/tests/language-behaviour/strings/141-space-in-filename.space here.out.expected (from rev 4602, trunk/tests/language-behaviour/141-space-in-filename.space here.out.expected)
===================================================================
--- trunk/tests/language-behaviour/strings/141-space-in-filename.space here.out.expected (rev 0)
+++ trunk/tests/language-behaviour/strings/141-space-in-filename.space here.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+hello
Copied: trunk/tests/language-behaviour/strings/141-space-in-filename.swift (from rev 4602, trunk/tests/language-behaviour/141-space-in-filename.swift)
===================================================================
--- trunk/tests/language-behaviour/strings/141-space-in-filename.swift (rev 0)
+++ trunk/tests/language-behaviour/strings/141-space-in-filename.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,12 @@
+type messagefile;
+
+(messagefile t) greeting() {
+ app {
+ echo "hello" stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"141-space-in-filename.space here.out">;
+
+outfile = greeting();
+
Added: trunk/tests/language-behaviour/strings/142-space-and-quotes. space .out.expected
===================================================================
Copied: trunk/tests/language-behaviour/strings/142-space-and-quotes.1.out.expected (from rev 4602, trunk/tests/language-behaviour/142-space-and-quotes.1.out.expected)
===================================================================
Added: trunk/tests/language-behaviour/strings/142-space-and-quotes.2" space ".out.expected
===================================================================
Copied: trunk/tests/language-behaviour/strings/142-space-and-quotes.2.out.expected (from rev 4602, trunk/tests/language-behaviour/142-space-and-quotes.2.out.expected)
===================================================================
Added: trunk/tests/language-behaviour/strings/142-space-and-quotes.3' space '.out.expected
===================================================================
Copied: trunk/tests/language-behaviour/strings/142-space-and-quotes.3.out.expected (from rev 4602, trunk/tests/language-behaviour/142-space-and-quotes.3.out.expected)
===================================================================
Copied: trunk/tests/language-behaviour/strings/142-space-and-quotes.out.expected (from rev 4602, trunk/tests/language-behaviour/142-space-and-quotes.out.expected)
===================================================================
Copied: trunk/tests/language-behaviour/strings/142-space-and-quotes.swift (from rev 4602, trunk/tests/language-behaviour/142-space-and-quotes.swift)
===================================================================
--- trunk/tests/language-behaviour/strings/142-space-and-quotes.swift (rev 0)
+++ trunk/tests/language-behaviour/strings/142-space-and-quotes.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,24 @@
+
+// this checks how spaces and quotes get passed through to underlying
+// executables
+
+type messagefile;
+
+(messagefile t) p() {
+ app {
+ touch @filename(t);
+ }
+}
+
+messagefile outfile <"142-space-and-quotes.out">;
+outfile = p();
+
+messagefile outfileB <"142-space-and-quotes. space .out">;
+outfileB = p();
+
+messagefile outfileC <"142-space-and-quotes.2\" space \".out">;
+outfileC = p();
+
+messagefile outfileD <"142-space-and-quotes.3' space '.out">;
+outfileD = p();
+
Added: trunk/tests/language-behaviour/strings/1421-space-and-quotes.''' ' ''' '' '''''' ' """"""""" ' ' ' """' "'".out.expected
===================================================================
Copied: trunk/tests/language-behaviour/strings/1421-space-and-quotes.1.out.expected (from rev 4602, trunk/tests/language-behaviour/1421-space-and-quotes.1.out.expected)
===================================================================
Added: trunk/tests/language-behaviour/strings/1421-space-and-quotes.2 sp"ace .out.expected
===================================================================
Added: trunk/tests/language-behaviour/strings/1421-space-and-quotes.2" space .out.expected
===================================================================
Added: trunk/tests/language-behaviour/strings/1421-space-and-quotes.2' sp"ac"e .out.expected
===================================================================
Copied: trunk/tests/language-behaviour/strings/1421-space-and-quotes.2.out.expected (from rev 4602, trunk/tests/language-behaviour/1421-space-and-quotes.2.out.expected)
===================================================================
Added: trunk/tests/language-behaviour/strings/1421-space-and-quotes.3 sp'ace .out.expected
===================================================================
Added: trunk/tests/language-behaviour/strings/1421-space-and-quotes.3' sp'ac'e .out.expected
===================================================================
Added: trunk/tests/language-behaviour/strings/1421-space-and-quotes.3' space .out.expected
===================================================================
Copied: trunk/tests/language-behaviour/strings/1421-space-and-quotes.3.out.expected (from rev 4602, trunk/tests/language-behaviour/1421-space-and-quotes.3.out.expected)
===================================================================
Copied: trunk/tests/language-behaviour/strings/1421-space-and-quotes.4.out.expected (from rev 4602, trunk/tests/language-behaviour/1421-space-and-quotes.4.out.expected)
===================================================================
Copied: trunk/tests/language-behaviour/strings/1421-space-and-quotes.5.out.expected (from rev 4602, trunk/tests/language-behaviour/1421-space-and-quotes.5.out.expected)
===================================================================
Copied: trunk/tests/language-behaviour/strings/1421-space-and-quotes.6.out.expected (from rev 4602, trunk/tests/language-behaviour/1421-space-and-quotes.6.out.expected)
===================================================================
Copied: trunk/tests/language-behaviour/strings/1421-space-and-quotes.7.out.expected (from rev 4602, trunk/tests/language-behaviour/1421-space-and-quotes.7.out.expected)
===================================================================
Copied: trunk/tests/language-behaviour/strings/1421-space-and-quotes.swift (from rev 4602, trunk/tests/language-behaviour/1421-space-and-quotes.swift)
===================================================================
--- trunk/tests/language-behaviour/strings/1421-space-and-quotes.swift (rev 0)
+++ trunk/tests/language-behaviour/strings/1421-space-and-quotes.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,32 @@
+
+// this checks how spaces and quotes get passed through to underlying
+// executables
+
+type messagefile;
+
+(messagefile t) p() {
+ app {
+ touch @filename(t);
+ }
+}
+
+messagefile outfileC <"1421-space-and-quotes.2\" space .out">;
+outfileC = p();
+
+messagefile outfileD <"1421-space-and-quotes.3' space .out">;
+outfileD = p();
+
+messagefile outfileE <"1421-space-and-quotes.2 sp\"ace .out">;
+outfileE = p();
+
+messagefile outfileF <"1421-space-and-quotes.3 sp'ace .out">;
+outfileF = p();
+
+messagefile outfileG <"1421-space-and-quotes.2' sp\"ac\"e .out">;
+outfileG = p();
+
+messagefile outfileH <"1421-space-and-quotes.3' sp'ac'e .out">;
+outfileH = p();
+
+messagefile outfileI <"1421-space-and-quotes.''' ' ''' '' '''''' ' \"\"\"\"\"\"\"\"\" ' ' ' \"\"\"' \"'\".out">;
+outfileI = p();
Copied: trunk/tests/language-behaviour/strings/143-newlines.out.expected (from rev 4602, trunk/tests/language-behaviour/143-newlines.out.expected)
===================================================================
--- trunk/tests/language-behaviour/strings/143-newlines.out.expected (rev 0)
+++ trunk/tests/language-behaviour/strings/143-newlines.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+hello world
Copied: trunk/tests/language-behaviour/strings/143-newlines.swift (from rev 4602, trunk/tests/language-behaviour/143-newlines.swift)
===================================================================
--- trunk/tests/language-behaviour/strings/143-newlines.swift (rev 0)
+++ trunk/tests/language-behaviour/strings/143-newlines.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,13 @@
+type messagefile;
+
+(messagefile t) greeting() {
+ app {
+ echo "hello"
+ "world" stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"143-newlines.out">;
+
+outfile = greeting();
+
Copied: trunk/tests/language-behaviour/strings/145-url.out.expected (from rev 4602, trunk/tests/language-behaviour/145-url.out.expected)
===================================================================
--- trunk/tests/language-behaviour/strings/145-url.out.expected (rev 0)
+++ trunk/tests/language-behaviour/strings/145-url.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+hello
Copied: trunk/tests/language-behaviour/strings/145-url.swift (from rev 4602, trunk/tests/language-behaviour/145-url.swift)
===================================================================
--- trunk/tests/language-behaviour/strings/145-url.swift (rev 0)
+++ trunk/tests/language-behaviour/strings/145-url.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,12 @@
+type messagefile;
+
+(messagefile t) greeting() {
+ app {
+ echo "hello" stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"file://localhost/145-url.out">;
+
+outfile = greeting();
+
Copied: trunk/tests/language-behaviour/strings/161-star-dot.out.expected (from rev 4602, trunk/tests/language-behaviour/161-star-dot.out.expected)
===================================================================
--- trunk/tests/language-behaviour/strings/161-star-dot.out.expected (rev 0)
+++ trunk/tests/language-behaviour/strings/161-star-dot.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+two-C
Copied: trunk/tests/language-behaviour/strings/161-star-dot.swift (from rev 4602, trunk/tests/language-behaviour/161-star-dot.swift)
===================================================================
--- trunk/tests/language-behaviour/strings/161-star-dot.swift (rev 0)
+++ trunk/tests/language-behaviour/strings/161-star-dot.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,36 @@
+type messagefile;
+
+(messagefile t) greeting(string s) {
+ app {
+ echo s stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"161-star-dot.out">;
+
+type astruct {
+ string a;
+ string b;
+ string c;
+};
+
+astruct foo[];
+
+foo[0].a = "zero-A";
+foo[0].b = "zero-B";
+foo[0].c = "zero-C";
+
+foo[1].a = "one-A";
+foo[1].b = "one-B";
+foo[1].c = "one-C";
+
+foo[2].a = "two-A";
+foo[2].b = "two-B";
+foo[2].c = "two-C";
+
+string s[] = foo[*].c;
+
+string u = s[2];
+
+outfile = greeting(u);
+
Deleted: trunk/tests/language-behaviour/testimport.swift
===================================================================
--- trunk/tests/language-behaviour/testimport.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/testimport.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,4 +0,0 @@
-import "testimport2";
-
-type file;
-
Deleted: trunk/tests/language-behaviour/testimport2.swift
===================================================================
--- trunk/tests/language-behaviour/testimport2.swift 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/testimport2.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1,4 +0,0 @@
-import "testimport";
-
-type F;
-
Modified: trunk/tests/language-behaviour/title.txt
===================================================================
--- trunk/tests/language-behaviour/title.txt 2011-06-16 18:03:24 UTC (rev 4623)
+++ trunk/tests/language-behaviour/title.txt 2011-06-16 19:15:58 UTC (rev 4624)
@@ -1 +1 @@
-Language-Behaviour Tests
+Language-Behavior Tests
Copied: trunk/tests/language-behaviour/variables/084-declare-many-at-once.swift (from rev 4602, trunk/tests/language-behaviour/084-declare-many-at-once.swift)
===================================================================
--- trunk/tests/language-behaviour/variables/084-declare-many-at-once.swift (rev 0)
+++ trunk/tests/language-behaviour/variables/084-declare-many-at-once.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,19 @@
+type messagefile {}
+
+(messagefile t) greeting() {
+ app {
+ echo "hello" stdout=@filename(t);
+ }
+}
+
+messagefile outfile = greeting();
+
+messagefile o2 = greeting(), o4 = greeting(), o5, o6[], o7=greeting();
+
+o6[0] = greeting();
+o6[1] = greeting();
+o5 = greeting();
+o6[2] = greeting();
+
+// can't check the output in present framework because don't know
+// what filename got chosen for outfile...
Copied: trunk/tests/language-behaviour/variables/120-local-vars.out.expected (from rev 4602, trunk/tests/language-behaviour/120-local-vars.out.expected)
===================================================================
--- trunk/tests/language-behaviour/variables/120-local-vars.out.expected (rev 0)
+++ trunk/tests/language-behaviour/variables/120-local-vars.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+hi
Copied: trunk/tests/language-behaviour/variables/120-local-vars.swift (from rev 4602, trunk/tests/language-behaviour/120-local-vars.swift)
===================================================================
--- trunk/tests/language-behaviour/variables/120-local-vars.swift (rev 0)
+++ trunk/tests/language-behaviour/variables/120-local-vars.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,17 @@
+type messagefile;
+
+(messagefile t) metagreeting(string m) {
+string l = m;
+t=greeting(l);
+}
+
+(messagefile t) greeting(string m) {
+ app {
+ echo m stdout=@filename(t);
+ }
+}
+
+messagefile outfile <"120-local-vars.out">;
+
+outfile = greeting("hi");
+
Copied: trunk/tests/language-behaviour/variables/121-multi-return-vars.first.out.expected (from rev 4602, trunk/tests/language-behaviour/121-multi-return-vars.first.out.expected)
===================================================================
--- trunk/tests/language-behaviour/variables/121-multi-return-vars.first.out.expected (rev 0)
+++ trunk/tests/language-behaviour/variables/121-multi-return-vars.first.out.expected 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1 @@
+hi
Copied: trunk/tests/language-behaviour/variables/121-multi-return-vars.second.out.expected (from rev 4602, trunk/tests/language-behaviour/121-multi-return-vars.second.out.expected)
===================================================================
Copied: trunk/tests/language-behaviour/variables/121-multi-return-vars.swift (from rev 4602, trunk/tests/language-behaviour/121-multi-return-vars.swift)
===================================================================
--- trunk/tests/language-behaviour/variables/121-multi-return-vars.swift (rev 0)
+++ trunk/tests/language-behaviour/variables/121-multi-return-vars.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,13 @@
+type messagefile;
+
+(messagefile a, messagefile b) greeting(string m) {
+ app {
+ echo m stdout=@filename(a) stderr=@filename(b);
+ }
+}
+
+messagefile firstfile <"121-multi-return-vars.first.out">;
+messagefile secondfile <"121-multi-return-vars.second.out">;
+
+(firstfile, secondfile) = greeting("hi");
+
Copied: trunk/tests/language-behaviour/variables/122-multi-return-vars.swift (from rev 4602, trunk/tests/language-behaviour/122-multi-return-vars.swift)
===================================================================
--- trunk/tests/language-behaviour/variables/122-multi-return-vars.swift (rev 0)
+++ trunk/tests/language-behaviour/variables/122-multi-return-vars.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,10 @@
+type messagefile;
+
+(messagefile a, messagefile b) greeting(string m) {
+ app {
+ echo m stdout=@filename(a) stderr=@filename(b);
+ }
+}
+
+(messagefile firstfile, messagefile secondfile) = greeting("hi");
+
Copied: trunk/tests/language-behaviour/variables/123-global-vars.swift (from rev 4602, trunk/tests/language-behaviour/123-global-vars.swift)
===================================================================
--- trunk/tests/language-behaviour/variables/123-global-vars.swift (rev 0)
+++ trunk/tests/language-behaviour/variables/123-global-vars.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,14 @@
+type messagefile;
+
+
+(messagefile t) greeting() {
+ app {
+ echo m stdout=@filename(t);
+ }
+}
+
+global string m = "hello";
+messagefile outfile <"123-global-vars.out">;
+
+outfile = greeting();
+
Copied: trunk/tests/language-behaviour/variables/1232-global-separate-assign.swift (from rev 4602, trunk/tests/language-behaviour/1232-global-separate-assign.swift)
===================================================================
--- trunk/tests/language-behaviour/variables/1232-global-separate-assign.swift (rev 0)
+++ trunk/tests/language-behaviour/variables/1232-global-separate-assign.swift 2011-06-16 19:15:58 UTC (rev 4624)
@@ -0,0 +1,15 @@
+type messagefile;
+
+
+(messagefile t) greeting() {
+ app {
+ echo m stdout=@filename(t);
+ }
+}
+
+global string m;
+m = "hi";
+messagefile outfile <"1232-global-separate-assign.aout">;
+
+outfile = greeting();
+
More information about the Swift-commit
mailing list