Commit Graph

12 Commits

Author SHA1 Message Date
Zoltan Somogyi
ce14206488 Clean up several aspects of extras/xml.
extras/xml/parsing.m:
extras/xml/unicode.m:
extras/xml/xml.cat.m:
extras/xml/xml.doc.m:
extras/xml/xml.dtd.m:
extras/xml/xml.encoding.m:
extras/xml/xml.m:
extras/xml/xml.ns.m:
extras/xml/xml.parse.chars.m:
extras/xml/xml.parse.m:
    Use predmode declarations when possible.

    Flatten camelCase.

    Add prefixes to the names of function symbols and fields
    if this avoid ambiguity, either with other parts of this code,
    or with standard Mercury function symbols or predicates.

    Replace uses of graphic characters such as ',' and '-' as
    general purpose function symbols with normal, alphanumeric
    function symbols. (Uses of graphic characters to stand for themselves
    in xml.parse.chars.m are unaffected.)

    Replace uses of graphic symbols such as ',' '->' and '[|]' as type names.

    Improve some other names as well.

    Convert (C->T;E) to (if C then T else E).

    Replace tabs with spaces.

    Delete unused imports.

    Make the order of definitions match the order of declarations.

extras/xml/tryit.m:
    Put the code for handling a single command line argument into its own
    predicate.

    Replace see/seen with read_named_file_as_string.

    Avoid using !IO to pass around the parser state.

    Instead of writing out the parse tree as a single very long line,
    convert both the DTD and the HTML code to a prettyprinter doc,
    and print that. This makes the output actually readable, and
    also makes it usefully diffable as well.

extras/xml/Mmakefile:
    Replace the old do-nothing check action with one that actually does
    check whether the code in this directory can do at least one simple task,
    the one mentioned in in samples/README. It would be nice of we had
    more tests, more extensive tests, or (preferably) both, but that would
    require someone who knows the code significantly better than I do.

    Add a rule for making the tags file.

    Compile the modules in this directory with the same default mmc flags
    as we use in the compiler directory.

extras/xml/XML_FLAGS:
    The default flags for modules in this directory.

extras/xml/Mercury.options:
    The non-default flags for modules in this directory.

extras/xml/samples/newsarticles.exp:
    The expected output of running the updated tryit program on the
    (just one) sample input in this directory.

extras/xml/README:
extras/xml/samples/README:
    Replace some obsolete references, and improve formatting.
2022-06-24 07:26:55 +10:00
Julien Fischer
20e02c9833 Style and formatting updates.
extras/xml/*.m:
    As above.
2022-04-15 18:19:44 +10:00
Julien Fischer
66611dfb0b Fix compilation of extras/xml.
extras/xml/tryit.m:
extras/xml/xml.cat.m:
extras/xml/xml.parse.chars.m:
    Conform to recent library changes.
2022-03-28 20:48:07 +11:00
Mark Brown
d465fa53cb Update the COPYING.LIB file and references to it.
Discussion of these changes can be found on the Mercury developers
mailing list archives from June 2018.

COPYING.LIB:
    Add a special linking exception to the LGPL.

*:
    Update references to COPYING.LIB.

    Clean up some minor errors that have accumulated in copyright
    messages.
2018-06-09 17:43:12 +10:00
Julien Fischer
2a8be7bbf6 Replace '__' as module qualifier in rest of the extras.
extras/*/*.m:
	Replace the use of '__' as a module qualifier in the rest of
	the extras.

	s/io\.state/io/ in the extras.

	Use '=' instead of is/2 in a spot.
2014-12-29 16:48:17 +11:00
Julien Fischer
9fb4f15dfc Fix compilation problems in the extras distribution caused by recent
Estimated hours taken: 0.5
Branches: main

Fix compilation problems in the extras distribution caused by recent
changes.

extras/stream/stream.m:
	Provide a definition for the type stream/1.

extras/*/*.m:
	Conform to the recent changes to the standard library.
2006-03-30 01:21:20 +00:00
Ian MacLarty
b2c6c59c87 Fix errors in the xml parser due to the use of obsolete notation.
Estimated hours taken: 0.2
Branches: main and 0.12

extras/xml/parsing.m:
extras/xml/tryit.m:
extras/xml/xml.ns.m:
extras/xml/xml.parse.m:
	Fix errors in the xml parser due to the use of obsolete notation.
2005-10-13 09:49:47 +00:00
Julien Fischer
0a25274404 Fix up some minor things in the extras distribution.
Estimated hours taken: 0.5
Branches: main

Fix up some minor things in the extras distribution.

extras/cgi/Mmakefile:
	Don't warn about mercury_www not exporting anything.

extras/complex_numbers/*.m:
	Replace `:' as the module qualifier.

	Use float.float/1 instead of the now obsolete
	int.to_float/2.

extras/concurrency/midimon.m:
	Replace `:' as the module qualifier.

extras/trailed_update/Mmakefile:
	Don't warn about trailed_update not exporting anything.

extras/xml/*.m:
	Replace `:' as the module qualifier.
	Remove some unnecessary imports.
	Put an underscore in front of an unused variable.
2004-07-30 07:04:45 +00:00
Simon Taylor
3d3e5f9411 Add io__input_stream_foldl', io__input_stream_foldl_io'
Estimated hours taken: 1

NEWS:
library/io.m:
	Add `io__input_stream_foldl', `io__input_stream_foldl_io'
	and `io__input_stream_foldl2_io', which apply a predicate
	to each character of an input stream in turn.

	Add a new result type `io__maybe_partial_res' which is
	used for operations which can return a partial result
	like io__input_stream_foldl* and io__read_file.

tests/general/io_regression.m:
extras/xml/xml.cat.m:
extras/xml/xml.parse.m:
extras/xml/tryit.m:
extras/morphine/source/coverage_util.m:
	Fix uses of io__read_file and io__read_file_as_string.

tests/general/Mmakefile:
tests/general/io_foldl.{m,exp}:
	Test case.
2002-01-22 14:21:52 +00:00
Ina Cheng
e8c1373bf9 Add a module to turn an XML document into a namespace-aware XML document.
Estimated hours taken: 44

Add a module to turn an XML document into a namespace-aware XML document.

extras/xml/tryit.m
	change the sample program to print out the new XML output

extras/xml/xml.m
	add xml.ns.m to the wrapper module

extra/xml/xml.ns.m
	the new module containing predicates to turn an XML document to a
	namespace-aware XML document
2001-01-05 04:15:44 +00:00
Ina Cheng
2d727ac647 Add a sample directory in the XML parser directory
Estimated hours taken: 1

Add a sample directory in the XML parser directory


extras/xml/README
	update the README file

extras/xml/tryit.m
	modify the file to print out all output messages as well as any
	error messages

extras/xml/samples
	a sample directory containing instructions on how to run the
	parser and some sample files

extras/xml/samples/README
	README file

extras/xml/samples/newsarticles.xml
	sample XML file for running the XML parser

extras/xml/samples/newsarticles.dtd
	sample DTD file for running the XML parser

extras/xml/samples/catalog
	a catalog file
2000-12-01 06:07:57 +00:00
Thomas Conway
236316cbe8 Add an XML parser to the extras directory
Estimated hours taken: 100


    Add an XML parser to the extras directory

extras/xml/README:
    A short readme describing the parser.

extras/xml/Mmake:
    The Mmake file for the sample program.

extras/xml/tryit.m:
    A sample program that just parses the files named on the command line.

extras/xml/xml*.m:
    The parser itself.

extras/xml/unicode.m:
    A bunch of functions that return the unicode values for numerous ascii
    symbols.

extras/xml/parsing.m:
    The parsing combinator set used by the xml parser.
2000-09-05 22:34:00 +00:00