Skip to content
This repository has been archived by the owner on Feb 1, 2020. It is now read-only.

Commit

Permalink
Merge pull request #799 from kframework/line-endings-problem
Browse files Browse the repository at this point in the history
FIx Windows line endings regex problem.
  • Loading branch information
dwightguth committed Aug 6, 2014
2 parents 1eca711 + e5c9d87 commit 08c9271
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions tutorial/2_languages/4_logik/basic/tests/append-2.logik.out
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"Y" \|-> (.*?)\n"Z" |-> cons \( a \( \), \1 \)
"Y" \|-> (.*?)\s+"Z" |-> cons \( a \( \), \1 \)
10 changes: 5 additions & 5 deletions tutorial/2_languages/4_logik/basic/tests/append-4.logik.out
Original file line number Diff line number Diff line change
@@ -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 \)
20 changes: 10 additions & 10 deletions tutorial/2_languages/4_logik/basic/tests/family-1.logik.out
Original file line number Diff line number Diff line change
@@ -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.*
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"A" \|-> A\n"B" \|-> B\n"C" \|-> A
"A" \|-> A\s+"B" \|-> B\s+"C" \|-> A
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"A" \|-> A\n"B" \|-> B\n"C" \|-> A
"A" \|-> A\s+"B" \|-> B\s+"C" \|-> A

0 comments on commit 08c9271

Please sign in to comment.