Commit Graph

13 Commits

Author SHA1 Message Date
Julien Fischer
5f2aac88c3 Replaces calls to deleted predicates.
samples/concurrency/midimon/midimon.m:
     As above.
2022-03-25 23:32:50 +11:00
Zoltan Somogyi
a653024ab7 Update many aspects of style in sample programs.
If we want to encourage people to read the sample programs
and learn Mercury programming from them, they should not be written
in an obsolete style.

samples/beer.m:
samples/calculator.m:
samples/calculator2.m:
samples/concurrency/midimon/midimon.m:
samples/diff/diff_out.m:
samples/e.m:
samples/eliza.m:
samples/muz/dict.m:
samples/muz/higher_order.m:
samples/muz/muz.m:
samples/muz/typecheck.m:
samples/muz/word.m:
samples/muz/zabstract.m:
samples/muz/zlogic.m:
samples/muz/zparser.m:
samples/muz/ztoken.m:
samples/muz/ztoken_io.m:
samples/muz/ztype.m:
samples/muz/ztype_op.m:
samples/rot13/rot13_concise.m:
samples/rot13/rot13_gustavo.m:
samples/rot13/rot13_juergen.m:
samples/rot13/rot13_ralph.m:
samples/rot13/rot13_verbose.m:
samples/solutions/all_solutions.m:
samples/solutions/n_solutions.m:
samples/solutions/one_solution.m:
samples/solutions/some_solutions.m:
samples/solver_types/eqneq.m:
samples/solver_types/sudoku.m:
samples/solver_types/test_eqneq.m:
    Replace uses of __ as module qualifier with dot.

    Replace (C->T;E) with (if C then T else E).

    Use our usual indentation for if-then-elses and for switches.

    Import one module per line. Put those imports into alphabetical order.

    Replace many uses of DCGs with state variables, leaving DCGs
    mostly just for parsing code.

    Use predmode declarations where this helps.

    Put predicates in top-down order where relevant.

    Use io.format where this helps.

    Do not put more than one predicate call on one line.

    Put each function symbol in a du type on a separate line.

    Put spaces after commas, around the bar in list syntax,
    around arithmetic operators, and around minus signs used for pairs.

    Replace tab indentation with four-space indentation.

    Delete spaces at the ends of lines.
    Replace two or more consecutive blank lines with one blank line.
    Delete blank lines that do not help structure the code.

    There are probably still some examples of old practices remaining;
    I do not claim to have fixed them all.
2021-07-07 05:32:09 +10:00
Peter Wang
8da4853b49 Update programs for getopt changes.
benchmarks/progs/icfp2000_par/main.m:
benchmarks/progs/mandelbrot/mandelbrot.m:
benchmarks/tools/log_to_r/log_to_r.m:
extras/align_right/align_right.m:
extras/error/error.m:
extras/gator/evolve.m:
extras/moose/options.m:
samples/concurrency/midimon/midimon.m:
samples/diff/diff.m:
samples/muz/muz.m:
    Conform to getopt.process_options now returning structured errors
    instead of strings.
2020-10-26 16:24:11 +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
d29581dfb4 Update concurrency samples.
samples/concurrency/midimon/concurrent_stream.m:
     Conform to the current version of the standard library.

samples/concurrency/midimon/midi.m:
samples/concurrency/midimon/midimon.m:
samples/concurrency/dining_philosophers/philo.m:
samples/concurrency/dining_philosophers/philo2.m:
samples/concurrency/dining_philosophers/philo3.m:
     Syntax and formatting fixes.
2016-10-02 23:26:02 +11:00
Sebastian Godelet
fcee76f671 Update .gitignore files.
Update .gitignore files to ignore Unix executables and intermediate files.

extras/.gitignore:
    ignore *.beams

extras/cgi/.gitignore:
extras/gator/.gitignore:
extras/graphics/mercury_cairo/tutorial/.gitignore:
extras/logged_output/.gitignore:
extras/monte/.gitignore:
extras/odbc/.gitignore:
extras/posix/samples/.gitignore:
extras/quickcheck/.gitignore:
extras/quickcheck/tutes/.gitignore:
extras/references/samples/.gitignore:
    ignore executable(s)

extras/references/tests/.gitignore:
extras/trailed_update/tests/.gitignore:
    ignore test *.res and *.out files,
    ignore executable

extras/windows_installer_generator/sample/.gitignore:
samples/concurrency/dining_philosophers/.gitignore:
samples/concurrency/midimon/.gitignore:
    ignore executables

tests/hard_coded/.gitignore:
    ignore *.o and *.obj object files
2014-11-06 22:33:48 +11:00
Julien Fischer
8151ec691c More MinGW64 related cleanups.
runtime/mercury_mm_own_stacks.c:
    Use Sleep() instead of sleep() on Windows.

    Avoid warnings from the C compiler.

samples/concurrency/dining_philosophers/philo.m:
samples/concurrency/dining_philosophers/philo3.m:
	Use '.' as a module qualifier in a spot.

	Replace calls to obsolete predicates.
2013-04-07 22:05:00 +10:00
Julien Fischer
b93e1f1926 Fix a problem with two of the concurrency examples on MinGW.
Branches: main

Fix a problem with two of the concurrency examples on MinGW.

samples/concurrency/dining_philosophers/philo2.m:
samples/concurrency/dining_philosophers/philo3.m:
	Use Sleep() whenever the Win32 API is available instead
	of only when MSVC is being used.
2010-12-14 16:52:52 +00:00
Julien Fischer
733da9a13e Avoid the copyright check for some files.
samples/concurrency/dining_philosophers/.nocopyright:
	Avoid the copyright check for some files.
2010-12-14 16:52:45 +00:00
Julien Fischer
f9c4f9c262 Fix a problem with two of the concurrency examples on MinGW.
Branches: main

Fix a problem with two of the concurrency examples on MinGW.

samples/concurrency/dining_philosophers/philo2.m:
samples/concurrency/dining_philosophers/philo3.m:
	Use Sleep() whenever the Win32 API is available instead
	of only when MSVC is being used.
2010-12-14 16:47:21 +00:00
Julien Fischer
a0efd454e3 Shift the remaining concurrency example out of extras distribution and into the
Branches: main

Shift the remaining concurrency example out of extras distribution and into the
samples directory.

samples/concurrency/midimon/concurrent_stream.m:
samples/concurrency/midimon/midi.m:
samples/concurrency/midimon/midimon.m:
samples/concurrency/midimon/midi_data:
	Shift the midi monitor example from the extras distribution
	into the samples directory.

samples/README:
	Add a description of the concurrency directory.

samples/concurrency/dining_philosophers/README:
samples/concurrency/midimon/README:
	Move the descriptions of the concurrency examples
	to these files.

extras/concurrency/Mercury.options:
extras/concurrency/Mmakefile:
extras/concurrency/midi.m:
extras/concurrency/midi_data:
extras/concurrency/midimon.m:
	Delete the midi monitor example from the extras
	distribution.

extras/README:
	Delete the description of the concurrency directory.
2010-11-26 15:46:03 +00:00
Julien Fischer
e55ae7e9eb Require that compilation model used for these modules
Branches: main

samples/concurrency/dining_philosophers/philo*.m:
	Require that compilation model used for these modules
	support concurrency.
2010-11-08 08:24:05 +00:00
Julien Fischer
d3a92c0719 Shift the dining philosophers examples out of the extras distribution and into
Branches: main

Shift the dining philosophers examples out of the extras distribution and into
the samples directory.  (The latter location is more appropriate for them since
the concurrency support has been part of the standard library for a while.)

The remaining contents of extras/concurrency will be moved into samples/concurrency
in a separate change.

extras/concurrency/philo.m:
extras/concurrency/philo2.m:
extras/concurrency/philo3.m:
	Shift these modules into samples/concurrency/dining_philosophers.

extras/concurrency/concurrency.m:
extras/concurrency/spawn.m:
	Delete the top-level of the old concurrency module and the spawn
	module.

extras/concurrency/Mercury.options:
extras/concurrency/Mmakefile:
	Don't build libconcurrency.

	Delete references to things that no longer exist or have been
	moved.
2010-11-08 08:19:10 +00:00