Move .output.txt to .stdout.txt to reflect which output stream the files contain

diff --git a/examples/01_hello.fur.output.txt b/examples/01_hello.fur.output.txt
deleted file mode 100644 (file)
index dbe9dba..0000000
--- a/examples/01_hello.fur.output.txt
+++ /dev/null
@@ -1 +0,0 @@
-Hello, world
\ No newline at end of file

diff --git a/examples/01_hello.fur.stdout.txt b/examples/01_hello.fur.stdout.txt
new file mode 100644 (file)
index 0000000..dbe9dba
--- /dev/null
+++ b/examples/01_hello.fur.stdout.txt
@@ -0,0 +1 @@
+Hello, world
\ No newline at end of file

diff --git a/examples/02_the_answer_to_the_ultimate_question.fur.output.txt b/examples/02_the_answer_to_the_ultimate_question.fur.output.txt
deleted file mode 100644 (file)
index f70d7bb..0000000
--- a/examples/02_the_answer_to_the_ultimate_question.fur.output.txt
+++ /dev/null
@@ -1 +0,0 @@
-42
\ No newline at end of file

diff --git a/examples/02_the_answer_to_the_ultimate_question.fur.stdout.txt b/examples/02_the_answer_to_the_ultimate_question.fur.stdout.txt
new file mode 100644 (file)
index 0000000..f70d7bb
--- /dev/null
+++ b/examples/02_the_answer_to_the_ultimate_question.fur.stdout.txt
@@ -0,0 +1 @@
+42
\ No newline at end of file

diff --git a/examples/03_multiple_statements.fur.output.txt b/examples/03_multiple_statements.fur.output.txt
deleted file mode 100644 (file)
index 18edf84..0000000
--- a/examples/03_multiple_statements.fur.output.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Hello, world
-Goodnight, moon
-Goodbye, cruel world
\ No newline at end of file

diff --git a/examples/03_multiple_statements.fur.stdout.txt b/examples/03_multiple_statements.fur.stdout.txt
new file mode 100644 (file)
index 0000000..18edf84
--- /dev/null
+++ b/examples/03_multiple_statements.fur.stdout.txt
@@ -0,0 +1,3 @@
+Hello, world
+Goodnight, moon
+Goodbye, cruel world
\ No newline at end of file

diff --git a/examples/04_math.fur.output.txt b/examples/04_math.fur.output.txt
deleted file mode 100644 (file)
index f79bf6b..0000000
--- a/examples/04_math.fur.output.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-3
-4
-6
-8
-1
\ No newline at end of file

diff --git a/examples/04_math.fur.stdout.txt b/examples/04_math.fur.stdout.txt
new file mode 100644 (file)
index 0000000..f79bf6b
--- /dev/null
+++ b/examples/04_math.fur.stdout.txt
@@ -0,0 +1,5 @@
+3
+4
+6
+8
+1
\ No newline at end of file

diff --git a/examples/05_order_of_operations.fur.output.txt b/examples/05_order_of_operations.fur.output.txt
deleted file mode 100644 (file)
index d9ae1ce..0000000
--- a/examples/05_order_of_operations.fur.output.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-7
-4
-3
--5
-4
-3
\ No newline at end of file

diff --git a/examples/05_order_of_operations.fur.stdout.txt b/examples/05_order_of_operations.fur.stdout.txt
new file mode 100644 (file)
index 0000000..d9ae1ce
--- /dev/null
+++ b/examples/05_order_of_operations.fur.stdout.txt
@@ -0,0 +1,6 @@
+7
+4
+3
+-5
+4
+3
\ No newline at end of file

diff --git a/examples/06_left_recursive_math.fur.output.txt b/examples/06_left_recursive_math.fur.output.txt
deleted file mode 100644 (file)
index 1c26a3f..0000000
--- a/examples/06_left_recursive_math.fur.output.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-8
-2
-16
-1
-1
\ No newline at end of file

diff --git a/examples/06_left_recursive_math.fur.stdout.txt b/examples/06_left_recursive_math.fur.stdout.txt
new file mode 100644 (file)
index 0000000..1c26a3f
--- /dev/null
+++ b/examples/06_left_recursive_math.fur.stdout.txt
@@ -0,0 +1,5 @@
+8
+2
+16
+1
+1
\ No newline at end of file

diff --git a/examples/07_power.fur.output.txt b/examples/07_power.fur.output.txt
deleted file mode 100644 (file)
index c147342..0000000
--- a/examples/07_power.fur.output.txt
+++ /dev/null
@@ -1 +0,0 @@
-81
\ No newline at end of file

diff --git a/examples/07_power.fur.stdout.txt b/examples/07_power.fur.stdout.txt
new file mode 100644 (file)
index 0000000..c147342
--- /dev/null
+++ b/examples/07_power.fur.stdout.txt
@@ -0,0 +1 @@
+81
\ No newline at end of file

diff --git a/examples/08_negativity.fur.output.txt b/examples/08_negativity.fur.output.txt
deleted file mode 100644 (file)
index d7d17fc..0000000
--- a/examples/08_negativity.fur.output.txt
+++ /dev/null
@@ -1 +0,0 @@
--1
\ No newline at end of file

diff --git a/examples/08_negativity.fur.stdout.txt b/examples/08_negativity.fur.stdout.txt
new file mode 100644 (file)
index 0000000..d7d17fc
--- /dev/null
+++ b/examples/08_negativity.fur.stdout.txt
@@ -0,0 +1 @@
+-1
\ No newline at end of file

diff --git a/examples/09_assignment.fur.output.txt b/examples/09_assignment.fur.output.txt
deleted file mode 100644 (file)
index dbe9dba..0000000
--- a/examples/09_assignment.fur.output.txt
+++ /dev/null
@@ -1 +0,0 @@
-Hello, world
\ No newline at end of file

diff --git a/examples/09_assignment.fur.stdout.txt b/examples/09_assignment.fur.stdout.txt
new file mode 100644 (file)
index 0000000..dbe9dba
--- /dev/null
+++ b/examples/09_assignment.fur.stdout.txt
@@ -0,0 +1 @@
+Hello, world
\ No newline at end of file

diff --git a/examples/10_boolean.fur.output.txt b/examples/10_boolean.fur.output.txt
deleted file mode 100644 (file)
index d252328..0000000
--- a/examples/10_boolean.fur.output.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-true
-false
\ No newline at end of file

diff --git a/examples/10_boolean.fur.stdout.txt b/examples/10_boolean.fur.stdout.txt
new file mode 100644 (file)
index 0000000..d252328
--- /dev/null
+++ b/examples/10_boolean.fur.stdout.txt
@@ -0,0 +1,2 @@
+true
+false
\ No newline at end of file

diff --git a/examples/11_parentheses.fur.output.txt b/examples/11_parentheses.fur.output.txt
deleted file mode 100644 (file)
index bf0d87a..0000000
--- a/examples/11_parentheses.fur.output.txt
+++ /dev/null
@@ -1 +0,0 @@
-4
\ No newline at end of file

diff --git a/examples/11_parentheses.fur.stdout.txt b/examples/11_parentheses.fur.stdout.txt
new file mode 100644 (file)
index 0000000..bf0d87a
--- /dev/null
+++ b/examples/11_parentheses.fur.stdout.txt
@@ -0,0 +1 @@
+4
\ No newline at end of file

diff --git a/examples/12_integer_comparison.fur.output.txt b/examples/12_integer_comparison.fur.output.txt
deleted file mode 100644 (file)
index b9e30a3..0000000
--- a/examples/12_integer_comparison.fur.output.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-13 < 17: true
-17 < 17: false
-19 < 17: false
-13 > 17: false
-17 > 17: false
-19 > 17: true
-13 == 17: false
-17 == 17: true
-19 == 17: false
-13 <= 17: true
-17 <= 17: true
-19 <= 17: false
-13 >= 17: false
-17 >= 17: true
-19 >= 17: true
-13 != 17: true
-17 != 17: false
-19 != 17: true
\ No newline at end of file

diff --git a/examples/12_integer_comparison.fur.stdout.txt b/examples/12_integer_comparison.fur.stdout.txt
new file mode 100644 (file)
index 0000000..b9e30a3
--- /dev/null
+++ b/examples/12_integer_comparison.fur.stdout.txt
@@ -0,0 +1,18 @@
+13 < 17: true
+17 < 17: false
+19 < 17: false
+13 > 17: false
+17 > 17: false
+19 > 17: true
+13 == 17: false
+17 == 17: true
+19 == 17: false
+13 <= 17: true
+17 <= 17: true
+19 <= 17: false
+13 >= 17: false
+17 >= 17: true
+19 >= 17: true
+13 != 17: true
+17 != 17: false
+19 != 17: true
\ No newline at end of file

diff --git a/examples/13_ternary_comparison.fur.output.txt b/examples/13_ternary_comparison.fur.output.txt
deleted file mode 100644 (file)
index 1e6d32f..0000000
--- a/examples/13_ternary_comparison.fur.output.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-1 < 2 < 2: false
-2 < 2 < 2: false
-1 < 2 < 3: true
-2 < 2 < 3: false
\ No newline at end of file

diff --git a/examples/13_ternary_comparison.fur.stdout.txt b/examples/13_ternary_comparison.fur.stdout.txt
new file mode 100644 (file)
index 0000000..1e6d32f
--- /dev/null
+++ b/examples/13_ternary_comparison.fur.stdout.txt
@@ -0,0 +1,4 @@
+1 < 2 < 2: false
+2 < 2 < 2: false
+1 < 2 < 3: true
+2 < 2 < 3: false
\ No newline at end of file

diff --git a/examples/14_boolean_operators.fur.output.txt b/examples/14_boolean_operators.fur.output.txt
deleted file mode 100644 (file)
index 60b33ea..0000000
--- a/examples/14_boolean_operators.fur.output.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-false and false: false
-false and true: false
-true and false: false
-true and true: true
-false or false: false
-false or true: true
-true or false: true
-true or true: true
\ No newline at end of file

diff --git a/examples/14_boolean_operators.fur.stdout.txt b/examples/14_boolean_operators.fur.stdout.txt
new file mode 100644 (file)
index 0000000..60b33ea
--- /dev/null
+++ b/examples/14_boolean_operators.fur.stdout.txt
@@ -0,0 +1,8 @@
+false and false: false
+false and true: false
+true and false: false
+true and true: true
+false or false: false
+false or true: true
+true or false: true
+true or true: true
\ No newline at end of file

diff --git a/examples/15_varargs.fur.output.txt b/examples/15_varargs.fur.output.txt
deleted file mode 100644 (file)
index ac2ea2c..0000000
--- a/examples/15_varargs.fur.output.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Hello, world
-42

diff --git a/examples/15_varargs.fur.stdout.txt b/examples/15_varargs.fur.stdout.txt
new file mode 100644 (file)
index 0000000..ac2ea2c
--- /dev/null
+++ b/examples/15_varargs.fur.stdout.txt
@@ -0,0 +1,2 @@
+Hello, world
+42

diff --git a/examples/16_functions.fur.output.txt b/examples/16_functions.fur.output.txt
deleted file mode 100644 (file)
index f70d7bb..0000000
--- a/examples/16_functions.fur.output.txt
+++ /dev/null
@@ -1 +0,0 @@
-42
\ No newline at end of file

diff --git a/examples/16_functions.fur.stdout.txt b/examples/16_functions.fur.stdout.txt
new file mode 100644 (file)
index 0000000..f70d7bb
--- /dev/null
+++ b/examples/16_functions.fur.stdout.txt
@@ -0,0 +1 @@
+42
\ No newline at end of file

diff --git a/examples/17_short_circuiting.fur.output.txt b/examples/17_short_circuiting.fur.output.txt
deleted file mode 100644 (file)
index 21ff499..0000000
--- a/examples/17_short_circuiting.fur.output.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-This should only print once.
-This should print exactly twice.
-This should print exactly twice.

diff --git a/examples/17_short_circuiting.fur.stdout.txt b/examples/17_short_circuiting.fur.stdout.txt
new file mode 100644 (file)
index 0000000..21ff499
--- /dev/null
+++ b/examples/17_short_circuiting.fur.stdout.txt
@@ -0,0 +1,3 @@
+This should only print once.
+This should print exactly twice.
+This should print exactly twice.

diff --git a/examples/18_comments.fur.output.txt b/examples/18_comments.fur.output.txt
deleted file mode 100644 (file)
index a5c1966..0000000
--- a/examples/18_comments.fur.output.txt
+++ /dev/null
@@ -1 +0,0 @@
-Hello, world

diff --git a/examples/18_comments.fur.stdout.txt b/examples/18_comments.fur.stdout.txt
new file mode 100644 (file)
index 0000000..a5c1966
--- /dev/null
+++ b/examples/18_comments.fur.stdout.txt
@@ -0,0 +1 @@
+Hello, world

diff --git a/examples/19_closures.fur.output.txt b/examples/19_closures.fur.output.txt
deleted file mode 100644 (file)
index a5c1966..0000000
--- a/examples/19_closures.fur.output.txt
+++ /dev/null
@@ -1 +0,0 @@
-Hello, world

diff --git a/examples/19_closures.fur.stdout.txt b/examples/19_closures.fur.stdout.txt
new file mode 100644 (file)
index 0000000..a5c1966
--- /dev/null
+++ b/examples/19_closures.fur.stdout.txt
@@ -0,0 +1 @@
+Hello, world

diff --git a/examples/20_cycles.fur.output.txt b/examples/20_cycles.fur.output.txt
deleted file mode 100644 (file)
index f70d7bb..0000000
--- a/examples/20_cycles.fur.output.txt
+++ /dev/null
@@ -1 +0,0 @@
-42
\ No newline at end of file

diff --git a/examples/20_cycles.fur.stdout.txt b/examples/20_cycles.fur.stdout.txt
new file mode 100644 (file)
index 0000000..f70d7bb
--- /dev/null
+++ b/examples/20_cycles.fur.stdout.txt
@@ -0,0 +1 @@
+42
\ No newline at end of file

diff --git a/examples/21_arguments.fur.output.txt b/examples/21_arguments.fur.output.txt
deleted file mode 100644 (file)
index daaac9e..0000000
--- a/examples/21_arguments.fur.output.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-42
-42

diff --git a/examples/21_arguments.fur.stdout.txt b/examples/21_arguments.fur.stdout.txt
new file mode 100644 (file)
index 0000000..daaac9e
--- /dev/null
+++ b/examples/21_arguments.fur.stdout.txt
@@ -0,0 +1,2 @@
+42
+42

diff --git a/examples/22_close_arguments.fur.output.txt b/examples/22_close_arguments.fur.output.txt
deleted file mode 100644 (file)
index daaac9e..0000000
--- a/examples/22_close_arguments.fur.output.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-42
-42

diff --git a/examples/22_close_arguments.fur.stdout.txt b/examples/22_close_arguments.fur.stdout.txt
new file mode 100644 (file)
index 0000000..daaac9e
--- /dev/null
+++ b/examples/22_close_arguments.fur.stdout.txt
@@ -0,0 +1,2 @@
+42
+42

diff --git a/examples/23_parenthesized_functions.fur.output.txt b/examples/23_parenthesized_functions.fur.output.txt
deleted file mode 100644 (file)
index daaac9e..0000000
--- a/examples/23_parenthesized_functions.fur.output.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-42
-42

diff --git a/examples/23_parenthesized_functions.fur.stdout.txt b/examples/23_parenthesized_functions.fur.stdout.txt
new file mode 100644 (file)
index 0000000..daaac9e
--- /dev/null
+++ b/examples/23_parenthesized_functions.fur.stdout.txt
@@ -0,0 +1,2 @@
+42
+42

diff --git a/examples/24_function_calls_for_functions.fur.output.txt b/examples/24_function_calls_for_functions.fur.output.txt
deleted file mode 100644 (file)
index daaac9e..0000000
--- a/examples/24_function_calls_for_functions.fur.output.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-42
-42

diff --git a/examples/24_function_calls_for_functions.fur.stdout.txt b/examples/24_function_calls_for_functions.fur.stdout.txt
new file mode 100644 (file)
index 0000000..daaac9e
--- /dev/null
+++ b/examples/24_function_calls_for_functions.fur.stdout.txt
@@ -0,0 +1,2 @@
+42
+42

diff --git a/examples/25_if_statements.fur.output.txt b/examples/25_if_statements.fur.output.txt
deleted file mode 100644 (file)
index f48e806..0000000
--- a/examples/25_if_statements.fur.output.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Hello, world
-Goodnight, moon

diff --git a/examples/25_if_statements.fur.stdout.txt b/examples/25_if_statements.fur.stdout.txt
new file mode 100644 (file)
index 0000000..f48e806
--- /dev/null
+++ b/examples/25_if_statements.fur.stdout.txt
@@ -0,0 +1,2 @@
+Hello, world
+Goodnight, moon

diff --git a/examples/26_list_literals.fur.output.txt b/examples/26_list_literals.fur.output.txt
deleted file mode 100644 (file)
index f48e806..0000000
--- a/examples/26_list_literals.fur.output.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Hello, world
-Goodnight, moon

diff --git a/examples/26_list_literals.fur.stdout.txt b/examples/26_list_literals.fur.stdout.txt
new file mode 100644 (file)
index 0000000..f48e806
--- /dev/null
+++ b/examples/26_list_literals.fur.stdout.txt
@@ -0,0 +1,2 @@
+Hello, world
+Goodnight, moon

diff --git a/examples/27_string_concatenation.fur.output.txt b/examples/27_string_concatenation.fur.output.txt
deleted file mode 100644 (file)
index a5c1966..0000000
--- a/examples/27_string_concatenation.fur.output.txt
+++ /dev/null
@@ -1 +0,0 @@
-Hello, world

diff --git a/examples/27_string_concatenation.fur.stdout.txt b/examples/27_string_concatenation.fur.stdout.txt
new file mode 100644 (file)
index 0000000..a5c1966
--- /dev/null
+++ b/examples/27_string_concatenation.fur.stdout.txt
@@ -0,0 +1 @@
+Hello, world

diff --git a/examples/28_double_quoted_strings.fur.output.txt b/examples/28_double_quoted_strings.fur.output.txt
deleted file mode 100644 (file)
index f9f104d..0000000
--- a/examples/28_double_quoted_strings.fur.output.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Don't stop me now
-"Cogito ergo sum." --Descartes

diff --git a/examples/28_double_quoted_strings.fur.stdout.txt b/examples/28_double_quoted_strings.fur.stdout.txt
new file mode 100644 (file)
index 0000000..f9f104d
--- /dev/null
+++ b/examples/28_double_quoted_strings.fur.stdout.txt
@@ -0,0 +1,2 @@
+Don't stop me now
+"Cogito ergo sum." --Descartes

diff --git a/examples/29_structures.fur.output.txt b/examples/29_structures.fur.output.txt
deleted file mode 100644 (file)
index c86756d..0000000
--- a/examples/29_structures.fur.output.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Hello
-Goodbye

diff --git a/examples/29_structures.fur.stdout.txt b/examples/29_structures.fur.stdout.txt
new file mode 100644 (file)
index 0000000..c86756d
--- /dev/null
+++ b/examples/29_structures.fur.stdout.txt
@@ -0,0 +1,2 @@
+Hello
+Goodbye

diff --git a/integration_tests.py b/integration_tests.py
index 53bc265..7669aea 100644 (file)
--- a/integration_tests.py
+++ b/integration_tests.py
@@ -32,7 +32,7 @@ def add_example_output_test(filename):
             p = subprocess.Popen('./a.out', stdout=subprocess.PIPE, stderr=subprocess.PIPE)
             actual_stdout, actual_stderr = p.communicate()
 
-            expected_stdout_path = os.path.join('examples', filename + '.output.txt')
+            expected_stdout_path = os.path.join('examples', filename + '.stdout.txt')
 
             if os.path.isfile(expected_stdout_path):
                 with open(expected_stdout_path, 'rb') as f: