From e5c9d87de3fb60643ba21572a45e44db0fcb8395 Mon Sep 17 00:00:00 2001 From: Traian Florin Serbanuta Date: Thu, 7 Aug 2014 00:07:21 +0300 Subject: [PATCH] FIx Windows line endings regex problem. --- .../4_logik/basic/tests/append-2.logik.out | 4 ++-- .../4_logik/basic/tests/append-3.logik.out | 2 +- .../4_logik/basic/tests/append-4.logik.out | 10 +++++----- .../4_logik/basic/tests/family-1.logik.out | 20 +++++++++---------- .../basic/tests/reverse-fast-3.logik.out | 2 +- .../reverse-fast-palindromes-2.logik.out | 2 +- .../basic/tests/reverse-slow-3.logik.out | 2 +- .../reverse-slow-palindromes-2.logik.out | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/tutorial/2_languages/4_logik/basic/tests/append-2.logik.out b/tutorial/2_languages/4_logik/basic/tests/append-2.logik.out index f8e4777e71..5bea1dde1c 100644 --- a/tutorial/2_languages/4_logik/basic/tests/append-2.logik.out +++ b/tutorial/2_languages/4_logik/basic/tests/append-2.logik.out @@ -1,2 +1,2 @@ -\Q"L1" |-> cons ( a ( ), cons ( b ( ), nil ( ) ) )\E\n\Q"L2" |-> nil ( )\E -\Q"L1" |-> nil ( )\E\n\Q"L2" |-> cons ( b ( ), cons ( a ( ), nil ( ) ) )\E +\Q"L1" |-> cons ( a ( ), cons ( b ( ), nil ( ) ) )\E\s+\Q"L2" |-> nil ( )\E +\Q"L1" |-> nil ( )\E\s+\Q"L2" |-> cons ( b ( ), cons ( a ( ), nil ( ) ) )\E diff --git a/tutorial/2_languages/4_logik/basic/tests/append-3.logik.out b/tutorial/2_languages/4_logik/basic/tests/append-3.logik.out index 33c3df4ce4..fc102fbc58 100644 --- a/tutorial/2_languages/4_logik/basic/tests/append-3.logik.out +++ b/tutorial/2_languages/4_logik/basic/tests/append-3.logik.out @@ -1 +1 @@ -"Y" \|-> (.*?)\n"Z" |-> cons \( a \( \), \1 \) +"Y" \|-> (.*?)\s+"Z" |-> cons \( a \( \), \1 \) diff --git a/tutorial/2_languages/4_logik/basic/tests/append-4.logik.out b/tutorial/2_languages/4_logik/basic/tests/append-4.logik.out index 3bb01c4768..7c95a30ddc 100644 --- a/tutorial/2_languages/4_logik/basic/tests/append-4.logik.out +++ b/tutorial/2_languages/4_logik/basic/tests/append-4.logik.out @@ -1,5 +1,5 @@ -"L1" |-> cons \( (.*?), cons \( ((?!\1).*?), cons \( ((?!\1|\2).*?), cons \( ((?!\1|\2|\3).*?), nil \( \) \) \) \) \)\n"L2" \|-> L2\n"L3" \|-> cons \( \1, cons \( \2, cons \( \3, cons \( \4, cons \( a \( \), L2 \) \) \) \) \) -"L1" |-> cons \( (.*?), cons \( ((?!\1).*?), cons \( ((?!\1|\2).*?), nil \( \) \) \) \)\n"L2" \|-> L2\n"L3" \|-> cons \( \1, cons \( \2, cons \( \3, cons \( a \( \), L2 \) \) \) \) -"L1" |-> cons \( (.*?), cons \( ((?!\1).*?), nil \( \) \) \)\n"L2" \|-> L2\n"L3" \|-> cons \( \1, cons \( \2, cons \( a \( \), L2 \) \) \) -"L1" |-> cons \( (.*?), nil \( \) \)\n"L2" \|-> L2\n"L3" \|-> cons \( \1, cons \( a \( \), L2 \) \) -"L1" |-> nil \( \)\n"L2" \|-> L2\n"L3" \|-> cons \( a \( \), L2 \) +"L1" |-> cons \( (.*?), cons \( ((?!\1).*?), cons \( ((?!\1|\2).*?), cons \( ((?!\1|\2|\3).*?), nil \( \) \) \) \) \)\s+"L2" \|-> L2\s+"L3" \|-> cons \( \1, cons \( \2, cons \( \3, cons \( \4, cons \( a \( \), L2 \) \) \) \) \) +"L1" |-> cons \( (.*?), cons \( ((?!\1).*?), cons \( ((?!\1|\2).*?), nil \( \) \) \) \)\s+"L2" \|-> L2\s+"L3" \|-> cons \( \1, cons \( \2, cons \( \3, cons \( a \( \), L2 \) \) \) \) +"L1" |-> cons \( (.*?), cons \( ((?!\1).*?), nil \( \) \) \)\s+"L2" \|-> L2\s+"L3" \|-> cons \( \1, cons \( \2, cons \( a \( \), L2 \) \) \) +"L1" |-> cons \( (.*?), nil \( \) \)\s+"L2" \|-> L2\s+"L3" \|-> cons \( \1, cons \( a \( \), L2 \) \) +"L1" |-> nil \( \)\s+"L2" \|-> L2\s+"L3" \|-> cons \( a \( \), L2 \) diff --git a/tutorial/2_languages/4_logik/basic/tests/family-1.logik.out b/tutorial/2_languages/4_logik/basic/tests/family-1.logik.out index 1fb90519be..05c774dade 100644 --- a/tutorial/2_languages/4_logik/basic/tests/family-1.logik.out +++ b/tutorial/2_languages/4_logik/basic/tests/family-1.logik.out @@ -1,10 +1,10 @@ -"A".*jim.*\n"B".*john.*\n"X".*david.* -"A".*nathan.*\n"B".*david.*\n"X".*jim.* -"A".*nathan.*\n"B".*david.*\n"X".*steve.* -"A".*nathan.*\n"B".*jim.*\n"X".*steve.* -"A".*nathan.*\n"B".*john.*\n"X".*david.* -"A".*nathan.*\n"B".*john.*\n"X".*jim.* -"A".*nathan.*\n"B".*john.*\n"X".*steve.* -"A".*steve.*\n"B".*david.*\n"X".*jim.* -"A".*steve.*\n"B".*john.*\n"X".*david.* -"A".*steve.*\n"B".*john.*\n"X".*jim.* +"A".*jim.*\s+"B".*john.*\s+"X".*david.* +"A".*nathan.*\s+"B".*david.*\s+"X".*jim.* +"A".*nathan.*\s+"B".*david.*\s+"X".*steve.* +"A".*nathan.*\s+"B".*jim.*\s+"X".*steve.* +"A".*nathan.*\s+"B".*john.*\s+"X".*david.* +"A".*nathan.*\s+"B".*john.*\s+"X".*jim.* +"A".*nathan.*\s+"B".*john.*\s+"X".*steve.* +"A".*steve.*\s+"B".*david.*\s+"X".*jim.* +"A".*steve.*\s+"B".*john.*\s+"X".*david.* +"A".*steve.*\s+"B".*john.*\s+"X".*jim.* diff --git a/tutorial/2_languages/4_logik/basic/tests/reverse-fast-3.logik.out b/tutorial/2_languages/4_logik/basic/tests/reverse-fast-3.logik.out index 7ed462b133..48a49c5c33 100644 --- a/tutorial/2_languages/4_logik/basic/tests/reverse-fast-3.logik.out +++ b/tutorial/2_languages/4_logik/basic/tests/reverse-fast-3.logik.out @@ -1 +1 @@ -\Q"L" |-> cons ( c ( ), cons ( X, cons ( a ( ), nil ( ) ) ) )\E\n\Q"T" |-> cons ( a ( ), cons ( X, cons ( c ( ), nil ( ) ) ) )\E\n\Q"X" |-> X\E +\Q"L" |-> cons ( c ( ), cons ( X, cons ( a ( ), nil ( ) ) ) )\E\s+\Q"T" |-> cons ( a ( ), cons ( X, cons ( c ( ), nil ( ) ) ) )\E\s+\Q"X" |-> X\E diff --git a/tutorial/2_languages/4_logik/basic/tests/reverse-fast-palindromes-2.logik.out b/tutorial/2_languages/4_logik/basic/tests/reverse-fast-palindromes-2.logik.out index 3eaa50dfd5..2b2334a86a 100644 --- a/tutorial/2_languages/4_logik/basic/tests/reverse-fast-palindromes-2.logik.out +++ b/tutorial/2_languages/4_logik/basic/tests/reverse-fast-palindromes-2.logik.out @@ -1 +1 @@ -"A" \|-> A\n"B" \|-> B\n"C" \|-> A +"A" \|-> A\s+"B" \|-> B\s+"C" \|-> A diff --git a/tutorial/2_languages/4_logik/basic/tests/reverse-slow-3.logik.out b/tutorial/2_languages/4_logik/basic/tests/reverse-slow-3.logik.out index 7ed462b133..48a49c5c33 100644 --- a/tutorial/2_languages/4_logik/basic/tests/reverse-slow-3.logik.out +++ b/tutorial/2_languages/4_logik/basic/tests/reverse-slow-3.logik.out @@ -1 +1 @@ -\Q"L" |-> cons ( c ( ), cons ( X, cons ( a ( ), nil ( ) ) ) )\E\n\Q"T" |-> cons ( a ( ), cons ( X, cons ( c ( ), nil ( ) ) ) )\E\n\Q"X" |-> X\E +\Q"L" |-> cons ( c ( ), cons ( X, cons ( a ( ), nil ( ) ) ) )\E\s+\Q"T" |-> cons ( a ( ), cons ( X, cons ( c ( ), nil ( ) ) ) )\E\s+\Q"X" |-> X\E diff --git a/tutorial/2_languages/4_logik/basic/tests/reverse-slow-palindromes-2.logik.out b/tutorial/2_languages/4_logik/basic/tests/reverse-slow-palindromes-2.logik.out index 3eaa50dfd5..2b2334a86a 100644 --- a/tutorial/2_languages/4_logik/basic/tests/reverse-slow-palindromes-2.logik.out +++ b/tutorial/2_languages/4_logik/basic/tests/reverse-slow-palindromes-2.logik.out @@ -1 +1 @@ -"A" \|-> A\n"B" \|-> B\n"C" \|-> A +"A" \|-> A\s+"B" \|-> B\s+"C" \|-> A