[m-rev.] diff: remove Prolog support

[Simon Taylor]

Estimated hours taken: 0.5
Branches: main

Remove Prolog support.

Makefile:
	Don't clean up Prolog files.

configure.in:
bindist/bindist.configure.in:
scripts/Mmakefile:
scripts/sicstus_conv.in:
	Remove sicstus_conv.in.

scripts/Mmake.rules:
scripts/Mmake.vars.in:
	Remove Prolog-related variables and targets.

Index: Makefile
===================================================================
RCS file: /home/mercury1/repository/mercury/Makefile,v
retrieving revision 1.10
diff -u -u -r1.10 Makefile
--- Makefile	10 Jan 2001 10:57:20 -0000	1.10
+++ Makefile	16 May 2002 06:15:46 -0000
@@ -43,12 +43,9 @@
 
 .PHONY: clean
 clean:
-	-rm -f */*.o */*.pic_o */*.a */*.so */*.no */*.ql */*.pl
+	-rm -f */*.o */*.pic_o */*.a */*.so
 	-rm -rf */Mercury/os */Mercury/pic_os */Mercury/libs
-	-rm -rf */Mercury/qls */Mercury/nos
 	-rm -f compiler/mercury_compile profiler/mercury_profile 
-	-rm -f library/library.nu* library/library.sicstus*
-	-rm -f library/sicstus_compile library/sicstus_saved_state
 	-rm -f util/mdemangle util/mkinit
 	cd boehm_gc; $(MMAKE_SUBDIR) clean
 
Index: configure.in
===================================================================
RCS file: /home/mercury1/repository/mercury/configure.in,v
retrieving revision 1.306
diff -u -u -r1.306 configure.in
--- configure.in	9 May 2002 11:49:24 -0000	1.306
+++ configure.in	15 May 2002 15:23:08 -0000
@@ -2976,7 +2976,7 @@
 scripts/mprof scripts/mercury_update_interface scripts/mgnuc
 scripts/parse_ml_options.sh-subr scripts/ml scripts/c2init
 scripts/mmake scripts/mdb scripts/mdbrc scripts/mdprof
-scripts/sicstus_conv scripts/mkfifo_using_mknod bindist/bindist.build_vars
+scripts/mkfifo_using_mknod bindist/bindist.build_vars
 ,
 for header in $CONFIG_HEADERS ; do
 	if test "$header" = "runtime/mercury_conf.h"; then
Index: bindist/bindist.configure.in
===================================================================
RCS file: /home/mercury1/repository/mercury/bindist/bindist.configure.in,v
retrieving revision 1.36
diff -u -u -r1.36 bindist.configure.in
--- bindist/bindist.configure.in	13 Feb 2002 05:26:22 -0000	1.36
+++ bindist/bindist.configure.in	15 May 2002 15:24:30 -0000
@@ -227,7 +227,7 @@
 #-----------------------------------------------------------------------------#
 AC_OUTPUT(Makefile scripts/mmc scripts/mercury.bat scripts/mprof scripts/mdprof
 scripts/mercury_update_interface scripts/mgnuc scripts/ml
-scripts/mmake scripts/c2init scripts/sicstus_conv
+scripts/mmake scripts/c2init
 scripts/mkfifo_using_mknod scripts/Mmake.vars
 scripts/mdb scripts/mdbrc
 ,
Index: scripts/Mmake.rules
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/Mmake.rules,v
retrieving revision 1.121
diff -u -u -r1.121 Mmake.rules
--- scripts/Mmake.rules	4 May 2002 15:15:59 -0000	1.121
+++ scripts/Mmake.rules	15 May 2002 15:08:39 -0000
@@ -35,8 +35,6 @@
 ifeq ($(MMAKE_USE_SUBDIRS),yes)
 
 MCFLAGS += --use-subdirs
-MSCFLAGS += --use-subdirs
-MNCFLAGS += --use-subdirs
 ALL_MGNUCFLAGS += -I.
 
 endif
@@ -68,29 +66,6 @@
 .PRECIOUS: $(java_dates_subdir)%.java_date
 .PRECIOUS: $(s_dates_subdir)%.s_date
 .PRECIOUS: $(pic_s_dates_subdir)%.pic_s_date
-
-#-----------------------------------------------------------------------------#
-#
-# Rules for NU-Prolog and SICStus Prolog.
-#
-
-.m.pl:
-	sicstus_conv $<
-
-.nl.pl:
-	sicstus_conv $<
-
-$(nos_subdir)%.no : %.m
-	$(MNC) $(ALL_MNCFLAGS) -o $@ $<
-
-$(nos_subdir)%.no : %.nl
-	$(MNC) $(ALL_MNCFLAGS) -o $@ $<
-
-$(qls_subdir)%.ql : %.m
-	$(MSC) $(ALL_MSCFLAGS) -o $@ $<
-
-$(qls_subdir)%.ql : %.nl
-	$(MSC) $(ALL_MSCFLAGS) -o $@ $<
 
 #-----------------------------------------------------------------------------#
 #
Index: scripts/Mmake.vars.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/Mmake.vars.in,v
retrieving revision 1.70
diff -u -u -r1.70 Mmake.vars.in
--- scripts/Mmake.vars.in	4 May 2002 15:15:59 -0000	1.70
+++ scripts/Mmake.vars.in	15 May 2002 15:10:20 -0000
@@ -317,42 +317,6 @@
 
 #-----------------------------------------------------------------------------#
 #
-# Stuff related to the Prolog back-ends
-# (XXX This is all obsolete and should probably be deleted)
-#
-
-MNC		= mnc
-ALL_MNCFLAGS	= $(MNCFLAGS) $(EXTRA_MNCFLAGS) $(TARGET_MNCFLAGS)
-MNCFLAGS	=
-EXTRA_MNCFLAGS	=
-
-MNL		= mnl
-ALL_MNLFLAGS	= $(MNLFLAGS) $(EXTRA_MNLFLAGS) $(TARGET_MNLFLAGS)
-MNLFLAGS	=
-EXTRA_MNLFLAGS	=
-
-MNP		= mnp
-ALL_MNPFLAGS	= $(MNPFLAGS) $(EXTRA_MNPFLAGS) $(TARGET_MNPFLAGS)
-MNPFLAGS	=
-EXTRA_MNPFLAGS	=
-
-MSC		= msc
-ALL_MSCFLAGS	= $(MSCFLAGS) $(EXTRA_MSCFLAGS) $(TARGET_MSCFLAGS)
-MSCFLAGS	=
-EXTRA_MSCFLAGS	=
-
-MSL		= msl
-ALL_MSLFLAGS	= $(MSLFLAGS) $(EXTRA_MSLFLAGS) $(TARGET_MSLFLAGS)
-MSLFLAGS	=
-EXTRA_MSLFLAGS	=
-
-MSP		= msp
-ALL_MSPFLAGS	= $(MSPFLAGS) $(EXTRA_MSPFLAGS) $(TARGET_MSPFLAGS)
-MSPFLAGS	=
-EXTRA_MSPFLAGS	=
-
-#-----------------------------------------------------------------------------#
-#
 # Stuff related to creating libraries
 #
 
@@ -550,15 +514,6 @@
 maybe-base-JAVACFLAGS- = $(JAVACFLAGS-$*)
 maybe-base-JAVACFLAGS-undefined =
 
-# Support for compiling Mercury programs with Prolog will probably be
-# dropped one of these days, so it's probably not worth bothering with these.
-TARGET_MNCFLAGS	=
-TARGET_MNLFLAGS	=
-TARGET_MNPFLAGS	=
-TARGET_MSCFLAGS	=
-TARGET_MSLFLAGS	=
-TARGET_MSPFLAGS	=
-
 #-----------------------------------------------------------------------------#
 #
 # The following variables specify the names of the subdirectories used,
@@ -573,8 +528,6 @@
 
 SUBDIR=Mercury/
 
-nos_subdir=$(SUBDIR)nos/
-qls_subdir=$(SUBDIR)qls/
 deps_subdir=$(SUBDIR)deps/
 ds_subdir=$(SUBDIR)ds/
 module_deps_subdir=$(SUBDIR)module_deps/
@@ -614,8 +567,6 @@
 
 SUBDIR=
 
-nos_subdir=
-qls_subdir=
 deps_subdir=
 ds_subdir=
 module_deps_subdir=
Index: scripts/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/Mmakefile,v
retrieving revision 1.26
diff -u -u -r1.26 Mmakefile
--- scripts/Mmakefile	18 Dec 2001 05:44:17 -0000	1.26
+++ scripts/Mmakefile	15 May 2002 15:15:20 -0000
@@ -15,7 +15,7 @@
 #-----------------------------------------------------------------------------#
 
 SCRIPTS = mmake mmc mdb c2init mgnuc ml mprof mprof_merge_runs \
-	  sicstus_conv mtags vpath_find mercury_update_interface \
+	  mtags vpath_find mercury_update_interface \
 	  mkfifo_using_mknod mercury_cleanup_install canonical_grade \
 	  mercury.bat
 DEBUGGER_SCRIPTS = mdbrc
Index: scripts/mmake.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/mmake.in,v
retrieving revision 1.40
diff -u -u -r1.40 mmake.in
--- scripts/mmake.in	1 May 2002 17:13:21 -0000	1.40
+++ scripts/mmake.in	16 May 2002 06:34:08 -0000
@@ -64,15 +64,6 @@
 	<module>:
 		Compile and link a Mercury program with main module
 		\`<module>.m' to produce an executable.
-	<module>.nu:
-		Compile and link a Mercury program with NU-Prolog
-		rather than with the Mercury compiler.
-	<module>.sicstus:
-		Compile and link a Mercury program with SICStus Prolog
-		rather than with the Mercury compiler.
-	<module>.nu.debug:
-	<module>.sicstus.debug:
-		Debugging versions of the above.
 	clean:
 		Remove intermediate files.
 	realclean:
Index: scripts/sicstus_conv.in
===================================================================
RCS file: scripts/sicstus_conv.in
diff -N scripts/sicstus_conv.in
--- scripts/sicstus_conv.in	27 Jul 1997 15:09:46 -0000	1.6
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,71 +0,0 @@
-#! /bin/sh
-# @configure_input@
-#---------------------------------------------------------------------------#
-# Copyright (C) 1995-1996 The University of Melbourne.
-# This file may only be copied under the terms of the GNU General
-# Public License - see the file COPYING in the Mercury distribution.
-#---------------------------------------------------------------------------#
-#
-# This sed script is used to convert from Mercury to Sicstus Prolog
-# It does three things: delete the `:- module' line,
-# expand backslash escapes, and replace the use
-# of `^' for xor in calls to is/2 with `#'.
-# The expansion of backslash escapes includes support for
-# "\c" line continuation sequences, whereby the sequence
-#	backslash, "c", whitespace
-# acts merely as layout text and is deleted from string literals;
-# this allows string literals to extend over multiple lines, as in
-#	X = "foo\c
-#		bar".
-# which is the same as X = "foobar".
-
-# The commands for expanding \c are a bit complicated;
-# here's an explanation.  
-#
-#       % this is the start of loop
-#	:l
-#		% if we see \c followed by any number of
-#		% spaces, tabs, or embedded newlines (\n), and then finally
-#		% followed by a non-embedded newline ($), we use the `N'
-#		% command to read in the next line; we then branch to
-#		% label `l' to start the loop again.
-#		/\\c\( *	*\n*\)*$/{
-#			N
-#			b l
-#		}
-#		% at this point, we've read in all the lines of the \c
-#		% command, so we replace the \c followed by any number of
-#		% spaces, tabs, or embedded newlines (\n) with an empty
-#		% string.
-#		% 
-#		/\\c\( *	*\n*\)*/s///g
-
-for file in "$@"; do
-	case $file in
-		*.m) base=`basename "$file" .m` ;;
-		*.nl) base=`basename "$file" .nl` ;;
-		*) base=`basename "$file"` ;;
-	esac
-	# see comments above for explanation of this `sed' command
-	sed -e '
-		/ is /s/\^/#/g
-		/^:- *module/d
-		/^[ 	]*%/s/.*//
-		/\\\\/s//\\/g
-		/\\a/s///g
-		/\\b/s///g
-		/\\r/s//
/g
-		/\\f/s//
/g
-		/\\t/s//	/g
-		/\\n/s//\
-/g
-		/\\v/s//
/g
-	:l
-		/\\c\( *	*\n*\)*$/{
-			N
-			b l
-		}
-		/\\c\( *	*\n*\)*/s///g
-		' "$file" > "$base".pl
-		# see comments above for explanation of this `sed' command
-done
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------