16 Commits

Author SHA1 Message Date
Zoltan Somogyi
a2f89cb891 Give some predicates better names.
extras/xml/parsing.m:
    As above.

extras/xml/xml.parse.m:
extras/xml/xml.parse.chars.m:
    Conform to the change in parsing.m.
2022-06-25 06:45:51 +10:00
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
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
Julien Fischer
a908799acb Fix issues in extras caused by recent changes.
extras/*/*.m:
     Avoid ambiguous pragmas.

     Replace an use of is.

     Fix module imports.
2021-06-19 21:11:35 +10: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
Sebastian Godelet
59ce15323f Fix samples/rot13_concise + libxml compilation error
boehm_gc/.gitignore:
    Ignore .obj files

extras/xml/xml.dtd.m:
extras/xml/xml.parse.m:
    Change the name of functor ('1') in the multiplicity/0 type
    to one. The former name does not (yet) work with the C# grade.

samples/.gitignore:
    Ignore library output and sample executables.

samples/c_interface/standalone_c/.gitignore:
    Ignore mercury_lib_int output files.

samples/c_interface/standalone_c/Makefile:
    chmod 0644.

samples/c_interface/.gitignore:
    Ignore object files and executables.

samples/java_interface/.gitignore:
    Ignore Java class files and executables.

samples/lazy_list/.gitignore:
samples/muz/.gitignore:
samples/rot13/.gitignore:
    Ignore executables.

samples/rot13/rot13_concise.m:
    Update call to index_det to use string.det_index.
    Added comments to clarify type inference.

samples/solutions/.gitignore:
    Ignore executables.

samples/solutions/all_solutions.m:
samples/solutions/n_solutions.m:
samples/solutions/one_solution.m:
samples/solutions/some_solutions.m:
    chmod 0644.

samples/solver_types/.gitignore:
    Ignore executables.

samples/solver_types/sudoku.m:
    Output the solution in a 3x3 grid.
2014-03-11 11:30:00 +11:00
Julien Fischer
9f68c330f0 Change the argument order of many of the predicates in the map, bimap, and
Branches: main

Change the argument order of many of the predicates in the map, bimap, and
multi_map modules so they are more conducive to the use of state variable
notation, i.e. make the order the same as in the sv* modules.

Prepare for the deprecation of the sv{bimap,map,multi_map} modules by
removing their use throughout the system.

library/bimap.m:
library/map.m:
library/multi_map.m:
	As above.
NEWS:
	Announce the change.

	Separate out the "highlights" from the "detailed listing" for
	the post-11.01 NEWS.

	Reorganise the announcement of the Unicode support.

benchmarks/*/*.m:
browser/*.m:
compiler/*.m:
deep_profiler/*.m:
extras/*/*.m:
mdbcomp/*.m:
profiler/*.m:
tests/*/*.m:
ssdb/*.m:
samples/*/*.m
slice/*.m:
	Conform to the above change.

	Remove any dependencies on the sv{bimap,map,multi_map} modules.
2011-05-03 04:35:04 +00:00
Mark Brown
115491212d Convert from iso-8859-1 to utf8.
extras/xml/xml.parse.m:
	Convert from iso-8859-1 to utf8.
2011-04-07 05:44:18 +00: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
673dfeb4fa Replace some more instances of '' I missed
Estimated hours taken: 0.1
Branches: main

extras/xml/xml.parse.m:
	Replace some more instances of '' I missed
	in my last diff.
2005-06-01 07:51:35 +00:00
Julien Fischer
b44d8c5b3c Delete the type '' ---> '' and replace instances of
Estimated hours taken: 0.1
Branches: main, 0.12

extras/xml/parsing.m:
extras/xml/xml.parse.m:
	Delete the type '' ---> '' and replace instances of
	it in these files with the unit type from std_util.
	The compiler no longer accepts the former type and
	we aren't going to allow it in future anyway.
2005-06-01 07:43:24 +00:00
Julien Fischer
e70923a910 Remove some non-abstract instance declarations from module
Estimated hours taken: 0.1
Branches: main, release

extras/xml/*.m:
	Remove some non-abstract instance declarations from module
	interfaces; the compiler no longer supports them.

	Replace uses of ':' as a module qualifier.

	Remove duplicate module imports.
2005-05-18 13:50:56 +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
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