From e4c4b10504bb2e8f53f765252608879e67b4971c Mon Sep 17 00:00:00 2001 From: Justin Meza Date: Sat, 2 Mar 2013 12:38:49 -0500 Subject: [PATCH] minor infrastructure stuff --- .gitignore | 6 ++++++ test/1.3-Tests/1-Structure/CMakeLists.txt | 16 ++++++++-------- test/1.3-Tests/12-Arrays/CMakeLists.txt | 6 +++--- .../6-Variables/10-Indirect/CMakeLists.txt | 6 ++++++ test/1.3-Tests/6-Variables/CMakeLists.txt | 1 + test/1.3-Tests/7-Operators/CMakeLists.txt | 16 ++++++++-------- test/1.3-Tests/9-Functions/CMakeLists.txt | 4 ++-- test/1.3-Tests/CMakeLists.txt | 6 +++--- .../13-Bindings/1-stdio/1-fopen/CMakeLists.txt | 2 ++ .../13-Bindings/1-stdio/1-fopen/read.dat | 7 +++++++ .../13-Bindings/1-stdio/1-fopen/test.lol | 10 ++++++++++ .../13-Bindings/1-stdio/1-fopen/test.out | 0 .../1.4-Tests/13-Bindings/1-stdio/CMakeLists.txt | 1 + test/1.4-Tests/13-Bindings/CMakeLists.txt | 1 + test/1.4-Tests/CMakeLists.txt | 1 + test/CMakeLists.txt | 1 + 16 files changed, 60 insertions(+), 24 deletions(-) create mode 100644 .gitignore create mode 100644 test/1.3-Tests/6-Variables/10-Indirect/CMakeLists.txt create mode 100644 test/1.4-Tests/13-Bindings/1-stdio/1-fopen/CMakeLists.txt create mode 100644 test/1.4-Tests/13-Bindings/1-stdio/1-fopen/read.dat create mode 100644 test/1.4-Tests/13-Bindings/1-stdio/1-fopen/test.lol create mode 100644 test/1.4-Tests/13-Bindings/1-stdio/1-fopen/test.out create mode 100644 test/1.4-Tests/13-Bindings/1-stdio/CMakeLists.txt create mode 100644 test/1.4-Tests/13-Bindings/CMakeLists.txt create mode 100644 test/1.4-Tests/CMakeLists.txt diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0895ea9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +CMakeCache.txt +CMakeFiles +Makefile +cmake_install.cmake +install_manifest.txt +CTestTestfile.cmake diff --git a/test/1.3-Tests/1-Structure/CMakeLists.txt b/test/1.3-Tests/1-Structure/CMakeLists.txt index e8334d6..bc4bd97 100644 --- a/test/1.3-Tests/1-Structure/CMakeLists.txt +++ b/test/1.3-Tests/1-Structure/CMakeLists.txt @@ -1,12 +1,4 @@ add_subdirectory(1-EmptyMainBlock) -add_subdirectory(10-CommasSeparate) -add_subdirectory(11-EllipsesJoinLF) -add_subdirectory(12-EllipsesJoinCR) -add_subdirectory(13-EllipsesJoinCRLF) -add_subdirectory(14-NoNewlineAfterJoinLF) -add_subdirectory(15-NoNewlineAfterJoinCR) -add_subdirectory(16-NoNewlineAfterJoinCRLF) -add_subdirectory(17-Includes) add_subdirectory(2-MustBeginWithHAI) add_subdirectory(3-MustIncludeVersion) add_subdirectory(4-MustEndWithKTHXBYE) @@ -15,3 +7,11 @@ add_subdirectory(6-WhitespaceBetweenTokens) add_subdirectory(7-NewlineLF) add_subdirectory(8-NewlineCR) add_subdirectory(9-NewlineCRLF) +add_subdirectory(10-CommasSeparate) +add_subdirectory(11-EllipsesJoinLF) +add_subdirectory(12-EllipsesJoinCR) +add_subdirectory(13-EllipsesJoinCRLF) +add_subdirectory(14-NoNewlineAfterJoinLF) +add_subdirectory(15-NoNewlineAfterJoinCR) +add_subdirectory(16-NoNewlineAfterJoinCRLF) +add_subdirectory(17-Includes) diff --git a/test/1.3-Tests/12-Arrays/CMakeLists.txt b/test/1.3-Tests/12-Arrays/CMakeLists.txt index f623c57..cc21526 100644 --- a/test/1.3-Tests/12-Arrays/CMakeLists.txt +++ b/test/1.3-Tests/12-Arrays/CMakeLists.txt @@ -1,7 +1,4 @@ add_subdirectory(1-EmptyArray) -add_subdirectory(10-CallingObjectInitialization) -add_subdirectory(11-AlternateSyntax) -add_subdirectory(12-Inheritance) add_subdirectory(2-SlotCreation) add_subdirectory(3-SlotInitialization) add_subdirectory(4-SlotAssignment) @@ -10,3 +7,6 @@ add_subdirectory(6-FunctionDeclaration) add_subdirectory(7-CallingObjectReference) add_subdirectory(8-CallingObjectAssignment) add_subdirectory(9-CallingObjectDeclaration) +add_subdirectory(10-CallingObjectInitialization) +add_subdirectory(11-AlternateSyntax) +add_subdirectory(12-Inheritance) diff --git a/test/1.3-Tests/6-Variables/10-Indirect/CMakeLists.txt b/test/1.3-Tests/6-Variables/10-Indirect/CMakeLists.txt new file mode 100644 index 0000000..6c22cd1 --- /dev/null +++ b/test/1.3-Tests/6-Variables/10-Indirect/CMakeLists.txt @@ -0,0 +1,6 @@ +add_subdirectory(1-Output) +add_subdirectory(2-Initialization) +add_subdirectory(3-Assignment) +add_subdirectory(4-TypeInitialization) +add_subdirectory(5-Deallocation) +add_subdirectory(6-Functions) diff --git a/test/1.3-Tests/6-Variables/CMakeLists.txt b/test/1.3-Tests/6-Variables/CMakeLists.txt index bfcd8a4..76135cd 100644 --- a/test/1.3-Tests/6-Variables/CMakeLists.txt +++ b/test/1.3-Tests/6-Variables/CMakeLists.txt @@ -7,3 +7,4 @@ add_subdirectory(6-Assignment) add_subdirectory(7-AssignmentSameVariable) add_subdirectory(8-TypeInitialization) add_subdirectory(9-Deallocation) +add_subdirectory(10-Indirect) diff --git a/test/1.3-Tests/7-Operators/CMakeLists.txt b/test/1.3-Tests/7-Operators/CMakeLists.txt index 6e1e44c..3887e56 100644 --- a/test/1.3-Tests/7-Operators/CMakeLists.txt +++ b/test/1.3-Tests/7-Operators/CMakeLists.txt @@ -1,4 +1,12 @@ add_subdirectory(1-Addition) +add_subdirectory(2-Subtraction) +add_subdirectory(3-Multiplication) +add_subdirectory(4-Division) +add_subdirectory(5-Modulo) +add_subdirectory(6-Maximum) +add_subdirectory(7-Minimum) +add_subdirectory(8-LogicalANDBinary) +add_subdirectory(9-LogicalORBinary) add_subdirectory(10-LogicalXORBinary) add_subdirectory(11-LogicalNOTUnary) add_subdirectory(12-LogicalANDNary) @@ -8,11 +16,3 @@ add_subdirectory(15-Inequality) add_subdirectory(16-Concatenation) add_subdirectory(17-ExplicitCast) add_subdirectory(18-ExplicitRecast) -add_subdirectory(2-Subtraction) -add_subdirectory(3-Multiplication) -add_subdirectory(4-Division) -add_subdirectory(5-Modulo) -add_subdirectory(6-Maximum) -add_subdirectory(7-Minimum) -add_subdirectory(8-LogicalANDBinary) -add_subdirectory(9-LogicalORBinary) diff --git a/test/1.3-Tests/9-Functions/CMakeLists.txt b/test/1.3-Tests/9-Functions/CMakeLists.txt index 845c4c6..ae60326 100644 --- a/test/1.3-Tests/9-Functions/CMakeLists.txt +++ b/test/1.3-Tests/9-Functions/CMakeLists.txt @@ -1,6 +1,4 @@ add_subdirectory(1-VoidWithSideEffects) -add_subdirectory(10-TooFewArguments) -add_subdirectory(11-EmptyBody) add_subdirectory(2-ReturnValue) add_subdirectory(3-VoidReturnValue) add_subdirectory(4-NilReturnValue) @@ -9,3 +7,5 @@ add_subdirectory(6-DoubleRecursion) add_subdirectory(7-ExpressionArguments) add_subdirectory(8-VoidMustHaveNoArguments) add_subdirectory(9-TooManyArguments) +add_subdirectory(10-TooFewArguments) +add_subdirectory(11-EmptyBody) diff --git a/test/1.3-Tests/CMakeLists.txt b/test/1.3-Tests/CMakeLists.txt index 5ca3502..31e1c08 100644 --- a/test/1.3-Tests/CMakeLists.txt +++ b/test/1.3-Tests/CMakeLists.txt @@ -1,8 +1,5 @@ add_subdirectory(0-Benchmarks) add_subdirectory(1-Structure) -add_subdirectory(10-Loops) -add_subdirectory(11-Unicode) -add_subdirectory(12-Arrays) add_subdirectory(2-Comments) add_subdirectory(3-Types) add_subdirectory(4-Output) @@ -11,3 +8,6 @@ add_subdirectory(6-Variables) add_subdirectory(7-Operators) add_subdirectory(8-Conditionals) add_subdirectory(9-Functions) +add_subdirectory(10-Loops) +add_subdirectory(11-Unicode) +add_subdirectory(12-Arrays) diff --git a/test/1.4-Tests/13-Bindings/1-stdio/1-fopen/CMakeLists.txt b/test/1.4-Tests/13-Bindings/1-stdio/1-fopen/CMakeLists.txt new file mode 100644 index 0000000..6fa1130 --- /dev/null +++ b/test/1.4-Tests/13-Bindings/1-stdio/1-fopen/CMakeLists.txt @@ -0,0 +1,2 @@ +INCLUDE(AddLolTest) +ADD_LOL_TEST(1-fopen OUTPUT test.out) diff --git a/test/1.4-Tests/13-Bindings/1-stdio/1-fopen/read.dat b/test/1.4-Tests/13-Bindings/1-stdio/1-fopen/read.dat new file mode 100644 index 0000000..a4fe450 --- /dev/null +++ b/test/1.4-Tests/13-Bindings/1-stdio/1-fopen/read.dat @@ -0,0 +1,7 @@ +THE fog comes +on little cat feet. + +It sits looking +over harbor and city +on silent haunches +and then moves on. diff --git a/test/1.4-Tests/13-Bindings/1-stdio/1-fopen/test.lol b/test/1.4-Tests/13-Bindings/1-stdio/1-fopen/test.lol new file mode 100644 index 0000000..0024d63 --- /dev/null +++ b/test/1.4-Tests/13-Bindings/1-stdio/1-fopen/test.lol @@ -0,0 +1,10 @@ +HAI 1.4 + CAN HAS STDIO? + I HAS A file + file R I IZ STDIO'Z FOPENIN YR "read.dat" AN YR "r" MKAY + file R I IZ STDIO'Z FOPENIN YR "write.dat" AN YR "w" MKAY + file R I IZ STDIO'Z FOPENIN YR "write.dat" AN YR "a" MKAY + file R I IZ STDIO'Z FOPENIN YR "write.dat" AN YR "r+" MKAY + file R I IZ STDIO'Z FOPENIN YR "write.dat" AN YR "w+" MKAY + file R I IZ STDIO'Z FOPENIN YR "write.dat" AN YR "a+" MKAY +KTHXBYE diff --git a/test/1.4-Tests/13-Bindings/1-stdio/1-fopen/test.out b/test/1.4-Tests/13-Bindings/1-stdio/1-fopen/test.out new file mode 100644 index 0000000..e69de29 diff --git a/test/1.4-Tests/13-Bindings/1-stdio/CMakeLists.txt b/test/1.4-Tests/13-Bindings/1-stdio/CMakeLists.txt new file mode 100644 index 0000000..3c192e3 --- /dev/null +++ b/test/1.4-Tests/13-Bindings/1-stdio/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(1-fopen) diff --git a/test/1.4-Tests/13-Bindings/CMakeLists.txt b/test/1.4-Tests/13-Bindings/CMakeLists.txt new file mode 100644 index 0000000..a707793 --- /dev/null +++ b/test/1.4-Tests/13-Bindings/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(1-stdio) diff --git a/test/1.4-Tests/CMakeLists.txt b/test/1.4-Tests/CMakeLists.txt new file mode 100644 index 0000000..6a5c6eb --- /dev/null +++ b/test/1.4-Tests/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(13-Bindings) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 0b7b9ba..87fb16d 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1 +1,2 @@ add_subdirectory(1.3-Tests) +add_subdirectory(1.4-Tests)