[m-rev.] trivial diff: update failing tests

Mark Brown dougl at cs.mu.OZ.AU
Tue May 7 00:05:29 AEST 2002


Estimated hours taken: 0.1
Branches: main

tests/invalid/Mmakefile:
tests/invalid/pragma_c_code_and_clauses1.err_exp:
tests/invalid/pragma_c_code_and_clauses1.m:
tests/invalid/pragma_c_code_and_clauses2.err_exp:
tests/invalid/pragma_c_code_and_clauses2.m:
tests/valid/Mmakefile:
tests/valid/pragma_c_code_and_clauses1.m:
tests/valid/pragma_c_code_and_clauses2.m:
	Move the pragma_c_code_and_clauses tests from invalid to valid,
	since this sort of code is now allowed.

Index: tests/invalid/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/invalid/Mmakefile,v
retrieving revision 1.108
diff -u -r1.108 Mmakefile
--- tests/invalid/Mmakefile	25 Mar 2002 21:13:29 -0000	1.108
+++ tests/invalid/Mmakefile	6 May 2002 13:58:05 -0000
@@ -84,8 +84,6 @@
 	occurs.m \
 	overloading.m \
 	polymorphic_unification.m \
-	pragma_c_code_and_clauses1.m \
-	pragma_c_code_and_clauses2.m \
 	pragma_c_code_dup_var.m \
 	pragma_c_code_no_det.m \
 	predmode.m \
Index: tests/invalid/pragma_c_code_and_clauses1.err_exp
===================================================================
RCS file: tests/invalid/pragma_c_code_and_clauses1.err_exp
diff -N tests/invalid/pragma_c_code_and_clauses1.err_exp
--- tests/invalid/pragma_c_code_and_clauses1.err_exp	31 Jul 2001 14:30:13 -0000	1.5
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-pragma_c_code_and_clauses1.m:009: Warning: `pragma' declaration in module interface.
-pragma_c_code_and_clauses1.m:007: Warning: clause in module interface.
-pragma_c_code_and_clauses1.m:009: Error: `:- pragma foreign_proc' (or `pragma c_code')
-pragma_c_code_and_clauses1.m:009: declaration for predicate `pragma_c_code_and_clauses1:foo/1'
-pragma_c_code_and_clauses1.m:009:   with preceding non-mode specific clauses.
-pragma_c_code_and_clauses1.m:005: In `foo(in)':
-pragma_c_code_and_clauses1.m:005:   error: determinism declaration not satisfied.
-pragma_c_code_and_clauses1.m:005:   Declared `multi', inferred `semidet'.
-pragma_c_code_and_clauses1.m:007:   In argument 1 of clause head:
-pragma_c_code_and_clauses1.m:007:   unification of `HeadVar__1' and `42' can fail.
-For more information, try recompiling with `-E'.
Index: tests/invalid/pragma_c_code_and_clauses1.m
===================================================================
RCS file: tests/invalid/pragma_c_code_and_clauses1.m
diff -N tests/invalid/pragma_c_code_and_clauses1.m
--- tests/invalid/pragma_c_code_and_clauses1.m	20 Nov 1995 09:32:02 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-:- module pragma_c_code_and_clauses1.
-
-:- interface.
-
-:- pred foo(int::in) is multidet.
-
-foo(42).
-
-:- pragma(c_code, foo(X::in), "some_function(X);").
Index: tests/invalid/pragma_c_code_and_clauses2.err_exp
===================================================================
RCS file: tests/invalid/pragma_c_code_and_clauses2.err_exp
diff -N tests/invalid/pragma_c_code_and_clauses2.err_exp
--- tests/invalid/pragma_c_code_and_clauses2.err_exp	31 Jul 2001 14:30:13 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-pragma_c_code_and_clauses2.m:007: Warning: `pragma' declaration in module interface.
-pragma_c_code_and_clauses2.m:009: Warning: clause in module interface.
-pragma_c_code_and_clauses2.m:009: Error: non mode-specific clause for predicate `pragma_c_code_and_clauses2:foo/1'
-pragma_c_code_and_clauses2.m:009:   with `:- pragma foreign_proc' declaration preceding.
-pragma_c_code_and_clauses2.m:005: In `foo(in)':
-pragma_c_code_and_clauses2.m:005:   warning: determinism declaration could be tighter.
-pragma_c_code_and_clauses2.m:005:   Declared `multi', inferred `det'.
-For more information, try recompiling with `-E'.
Index: tests/invalid/pragma_c_code_and_clauses2.m
===================================================================
RCS file: tests/invalid/pragma_c_code_and_clauses2.m
diff -N tests/invalid/pragma_c_code_and_clauses2.m
--- tests/invalid/pragma_c_code_and_clauses2.m	20 Nov 1995 09:32:03 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-:- module pragma_c_code_and_clauses2.
-
-:- interface.
-
-:- pred foo(int::in) is multidet.
-
-:- pragma(c_code, foo(X::in), "some_function(X);").
-
-foo(42).
Index: tests/valid/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/valid/Mmakefile,v
retrieving revision 1.98
diff -u -r1.98 Mmakefile
--- tests/valid/Mmakefile	25 Apr 2002 08:34:23 -0000	1.98
+++ tests/valid/Mmakefile	6 May 2002 13:58:11 -0000
@@ -135,6 +135,8 @@
 	nested_mod_type_bug.m \
 	nondet_live.m \
 	parsing_bug_main.m \
+	pragma_c_code_and_clauses1.m \
+	pragma_c_code_and_clauses2.m \
 	pred_with_no_modes.m \
 	qualified_cons_id.m \
 	quantifier_warning.m \
Index: tests/valid/pragma_c_code_and_clauses1.m
===================================================================
RCS file: tests/valid/pragma_c_code_and_clauses1.m
diff -N tests/valid/pragma_c_code_and_clauses1.m
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/valid/pragma_c_code_and_clauses1.m	6 May 2002 13:58:11 -0000
@@ -0,0 +1,9 @@
+:- module pragma_c_code_and_clauses1.
+
+:- interface.
+
+:- pred foo(int::in) is multidet.
+
+foo(42).
+
+:- pragma(c_code, foo(X::in), "some_function(X);").
Index: tests/valid/pragma_c_code_and_clauses2.m
===================================================================
RCS file: tests/valid/pragma_c_code_and_clauses2.m
diff -N tests/valid/pragma_c_code_and_clauses2.m
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/valid/pragma_c_code_and_clauses2.m	6 May 2002 13:58:12 -0000
@@ -0,0 +1,9 @@
+:- module pragma_c_code_and_clauses2.
+
+:- interface.
+
+:- pred foo(int::in) is multidet.
+
+:- pragma(c_code, foo(X::in), "some_function(X);").
+
+foo(42).
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------



More information about the reviews mailing list