Commit 361a3348 authored by Akim Demaille's avatar Akim Demaille
Browse files

2003-06-11 Akim Demaille <akim@epita.fr>

	* configure.ac (GHC, HAPPY): Look for them.
	* src/Makefile.am: Adjust.
	* doc/Makefile.am: Remove dead bits.
parent 66c9c82e
2003-06-11 Akim Demaille <akim@epita.fr>
* configure.ac (GHC, HAPPY): Look for them.
* src/Makefile.am: Adjust.
* doc/Makefile.am: Remove dead bits.
2003-06-10 Akim Demaille <akim@epita.fr>
* doc/havm.texi (The @havm{} Runtime): Sort, and include the
......
......@@ -5,7 +5,6 @@
# Public License version 2 as published by the Free Software
# Foundation.
#
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
......
......@@ -5,7 +5,6 @@
# Public License version 2 as published by the Free Software
# Foundation.
#
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
......@@ -19,7 +18,16 @@
AC_PREREQ([2.57])
AC_INIT([HAVM], [0.13a], [anisko_r@epita.fr])
AC_CONFIG_AUX_DIR(config)
AM_INIT_AUTOMAKE([foreign 1.7.3])
AM_INIT_AUTOMAKE([foreign 1.7.5])
AC_CHECK_TOOL([GHC], [ghc], [no])
if test $GHC = no; then
AC_MSG_ERROR([GHC is required])
fi
AC_CHECK_TOOL([HAPPY], [happy], [no])
if test HAPPY = no; then
AC_MSG_ERROR([Happy is required])
fi
AC_CONFIG_FILES([
Makefile
......
......@@ -17,11 +17,6 @@
AM_MAKEINFOFLAGS = --no-split
TEXI2DVI = texi2dvi --batch
TEXI2HTML = texi2html
TEXI2HTML_FLAGS = -split_chapter
info_TEXINFOS = havm.texi
havm_TEXINFOS = fdl.texi
# Files from texi2dvi that should be removed, but which Automake does
# not know.
......@@ -122,7 +122,7 @@ Information about @havm{} can be found on @href{@wiki{}/Projects/Havm,
@havm{} Home Page}, and feedback can be sent to
@href{projects@@lrde.epita.fr, @acronym{lrde}'s Projects Address}.
@acronym{LRDE} stands for @href{http://www.lrde.epita.fr, Laboratoire de
Recherche et Dévelopment de l'@acronym{epita}}, i.e., the Research and
Recherche et Dévelopment de l'@acronym{EPITA}}, i.e., the Research and
Development Labof @acronym{EPITA}, the @href{http://www.epita.fr, Ecole
Pour l'Informatique et les Techniques Avancées}.
......@@ -137,18 +137,18 @@ Haskell Compiler}.
@menu
* Invoking @havm{}::
* @havm{}'s Language::
* The @havm{} Language::
* Copying This Manual::
* Index::
@detailmenu
--- The Detailed Node Listing ---
@havm{}'s Language
The @havm{} Language
* @acronym{hir}::
* HIR::
* The @havm{} Runtime::
* @acronym{lir}::
* LIR::
Copying This Manual
......@@ -183,26 +183,26 @@ Display the version number and exit successfully.
Document the rest of it.
@end table
@node @havm{}'s Language
@chapter @havm{}'s Language
@node The @havm{} Language
@chapter The @havm{} Language
@havm{} supports two different source languages, @acronym{hir} and
@acronym{lir}, the second being a subset of the first one.
@havm{} supports two different source languages, @acronym{HIR} and
@acronym{LIR}, the second being a subset of the first one.
@menu
* @acronym{hir}::
* HIR::
* The @havm{} Runtime::
* @acronym{lir}::
* LIR::
@end menu
@node @acronym{hir}
@section @acronym{hir}
@node HIR
@section @acronym{HIR}
@cindex High Level Intermediate Representation
@cindex @acronym{hir}
@cindex @acronym{HIR}
In both languages, white spaces are ignored, and comments are introduced
by @kbd{#} and end at the end of line, or opened by @kbd{/*} and closed
by the next @kbd{*/}. @acronym{hir} is defined by the following
by the next @kbd{*/}. @acronym{HIR} is defined by the following
grammar:
@example
......@@ -295,16 +295,16 @@ and 1 otherwise.
@deffn string substring (@var{string}: string, @var{start}: int, @var{length}: int)
@end deffn
@node @acronym{lir}
@section @acronym{lir}
@node LIR
@section @acronym{LIR}
@cindex Low Level Intermediate Representation
@cindex @acronym{lir}
@cindex @acronym{LIR}
A valid @acronym{lir} program is a valid @acronym{hir} program that in
A valid @acronym{LIR} program is a valid @acronym{HIR} program that in
addition verifies the following constraints:
@table @asis
@item no nested @code{seq}
The @acronym{hir} tree must be flattened in a single thread of
The @acronym{HIR} tree must be flattened in a single thread of
execution. Therefore, there must be at most one @code{seq} per function.
@item no @code{eseq}
......
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 2)
(Project-Description "Haskell VM for Tiger")
(Project-Version havm 0 80)
(Parent-Version havm 0 79)
(Version-Log "* doc/havm.texi (The @havm{} Runtime): typo.")
(Project-Version havm 0 81)
(Parent-Version havm 0 80)
(Version-Log "2003-06-11 Akim Demaille <akim@epita.fr>
* configure.ac (GHC, HAPPY): Look for them.
* src/Makefile.am: Adjust.
* doc/Makefile.am: Remove dead bits.")
(New-Version-Log "")
(Checkin-Time "Tue, 10 Jun 2003 19:33:45 +0200")
(Checkin-Time "Wed, 11 Jun 2003 07:54:12 +0200")
(Checkin-Login akim)
(Populate-Ignore
(
......@@ -25,14 +29,14 @@
(Project-Keywords)
(Files
(prj (havm.prj) :symlink)
(ChangeLog (havm/0_ChangeLog 1.77 644))
(configure.ac (havm/34_configure. 1.5 644))
(Makefile.am (havm/35_Makefile.a 1.2 644))
(ChangeLog (havm/0_ChangeLog 1.78 644))
(configure.ac (havm/34_configure. 1.6 644))
(Makefile.am (havm/35_Makefile.a 1.3 644))
(config/Makefile.am (havm/36_Makefile.a 1.1 644))
(doc/Makefile.am (havm/38_Makefile.a 1.1 644))
(doc/havm.texi (havm/39_havm.texi 1.5 664))
(doc/Makefile.am (havm/38_Makefile.a 1.2 644))
(doc/havm.texi (havm/39_havm.texi 1.6 664))
(doc/fdl.texi (havm/40_fdl.texi 1.1 644))
(src/Annotation.hs (havm/21_Annotation 1.3 644))
......@@ -69,7 +73,7 @@
(src/Token.hs (havm/15_Token.hs 1.5 644))
(src/Trace.hs (havm/30_Trace.hs 1.1 644))
(src/Makefile.am (havm/16_Makefile 1.8 644))
(src/Makefile.am (havm/16_Makefile 1.9 644))
)
(Merge-Parents)
(New-Merge-Parents)
......@@ -5,7 +5,6 @@
# Public License version 2 as published by the Free Software
# Foundation.
#
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
......@@ -16,8 +15,6 @@
# the Free Software Foundation, 59 Temple Place - Suite 330, Boston,
# MA 02111-1307, USA.
HC = ghc
HAPPY = happy
SUFFIXES = .hs .y .hc
havm_sources = \
......@@ -59,13 +56,13 @@ dist_noinst_DATA = $(havm_sources)
havm_dependencies = $(havm_sources) Config.hs Parse.hs
havm: $(havm_dependencies)
$(HC) -i.:$(srcdir) -odir. -hidir. --make -package data $(srcdir)/Main.hs -o havm
$(GHC) -i.:$(srcdir) -odir. -hidir. --make -package data $(srcdir)/Main.hs -o havm
bsd: $(havm_dependencies)
$(HC) --make -package data -optl "-static" Main.hs -o havm
$(GHC) --make -package data -optl "-static" Main.hs -o havm
profile: $(havm_dependencies)
$(HC) --make -package data -prof -auto-all Main.hs -o havm
$(GHC) --make -package data -prof -auto-all Main.hs -o havm
CLEANFILES = *.hi *.hc *.o Parse.hs havm
......@@ -77,7 +74,7 @@ fclean: clean
$(HAPPY) $< -o $@
.hs.hc:
$(HC) -C -package data $< -o $@
$(GHC) -C -package data $< -o $@
.hc.c:
mv $< $@
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment