Merge pull request souffle-lang#1162 from mmcgr/windows

Friendlier file naming
joshuakarp · Nov 27, 2019 · 6eb678b · 6eb678b
2 parents 18e918d + 44dcc5b
commit 6eb678b
Show file tree

Hide file tree

Showing 12 changed files with 6 additions and 24 deletions.
diff --git a/tests/syntactic.at b/tests/syntactic.at
@@ -17,7 +17,6 @@ POSITIVE_TEST([input_directive3],[syntactic])
 POSITIVE_TEST([input_directive4],[syntactic])
 POSITIVE_TEST([input_directive_quotes2],[syntactic])
 POSITIVE_TEST([input_directive_quotes4],[syntactic])
-POSITIVE_TEST([input_directive_quotes5],[syntactic])
 POSITIVE_TEST([input_directive_quotes],[syntactic])
 POSITIVE_TEST([liberal_identifiers],[syntactic])
 POSITIVE_TEST([multiple_heads],[syntactic])

diff --git a/tests/syntactic/cpp_keywords/cpp_keywords.dl b/tests/syntactic/cpp_keywords/cpp_keywords.dl
@@ -214,9 +214,9 @@ error(1).
 pragma(1).
 .decl _Pragma(x:number)
 _Pragma(1).
-.decl worked?(x:number)
-.output worked?()
-worked?(X) :- workaround([X]).
+.decl worked(x:number)
+.output worked()
+worked(X) :- workaround([X]).
 // TODO (#467, #468): the following is a hack to disable stratification as over a hundred subprograms are produced for this test
 .type number_record = [ x:number ]
 .decl workaround(x:number_record)

diff --git a/tests/syntactic/cpp_keywords/worked?.csv → tests/syntactic/cpp_keywords/worked.csv b/tests/syntactic/cpp_keywords/worked?.csv → tests/syntactic/cpp_keywords/worked.csv
diff --git a/tests/syntactic/input_directive_quotes5/B.csv b/tests/syntactic/input_directive_quotes5/B.csv
diff --git a/tests/syntactic/input_directive_quotes5/facts/A"A.facts b/tests/syntactic/input_directive_quotes5/facts/A"A.facts
diff --git a/tests/syntactic/input_directive_quotes5/input_directive_quotes5.dl b/tests/syntactic/input_directive_quotes5/input_directive_quotes5.dl
diff --git a/tests/syntactic/input_directive_quotes5/input_directive_quotes5.err b/tests/syntactic/input_directive_quotes5/input_directive_quotes5.err
diff --git a/tests/syntactic/input_directive_quotes5/input_directive_quotes5.out b/tests/syntactic/input_directive_quotes5/input_directive_quotes5.out
diff --git a/...eral_identifiers/a_1234_?another_one_.csv → ...beral_identifiers/a_1234_another_one_.csv b/...eral_identifiers/a_1234_?another_one_.csv → ...beral_identifiers/a_1234_another_one_.csv
diff --git a/...entifiers/a_?_extended?_relation_name.csv → ...identifiers/a__extended_relation_name.csv b/...entifiers/a_?_extended?_relation_name.csv → ...identifiers/a__extended_relation_name.csv
diff --git a/...tactic/liberal_identifiers/facts/_?.facts → ...tic/liberal_identifiers/facts/input.facts b/...tactic/liberal_identifiers/facts/_?.facts → ...tic/liberal_identifiers/facts/input.facts
diff --git a/tests/syntactic/liberal_identifiers/liberal_identifiers.dl b/tests/syntactic/liberal_identifiers/liberal_identifiers.dl
@@ -6,7 +6,7 @@
 
 // : defines a directed graph
 .decl _?(x:number, y:number)
-.input _?()
+.input _?(filename="input.facts")
 
 // ? defines the transitive closure
 .decl ?(x:number, y:number)
@@ -19,11 +19,11 @@
 really_really_long_relation_string(A, B) :- ?(A, C), ?(A, D), ?(C, B), ?(D, B), !?(C,D), !?(D,C).
 
 .decl a_1234_?another_one_(x:number, y:number)
-.output a_1234_?another_one_()
+.output a_1234_?another_one_(filename="a_1234_another_one_.csv")
 a_1234_?another_one_(A,B) :- really_really_long_relation_string(A,C), really_really_long_relation_string(C,B).
 
 .decl a_?_extended?_relation_name(x:number, y:number)
-.output a_?_extended?_relation_name()
+.output a_?_extended?_relation_name(filename="a__extended_relation_name.csv")
 a_?_extended?_relation_name(A,B) :- really_really_long_relation_string(C,A), really_really_long_relation_string(C,B), A != B.
 a_?_extended?_relation_name(A,B) :- really_really_long_relation_string(A, B), a_?_extended?_relation_name(A,C), a_?_extended?_relation_name(C,B).
 a_?_extended?_relation_name(A,B) :- really_really_long_relation_string(A, B), a_?_extended?_relation_name(A,C), a_?_extended?_relation_name(B,C).