From 761c8889e9cc0d4e73f32f06290fe7d07d75d551 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Mon, 27 Oct 2008 02:31:37 +0000
Subject: * configure.ac.pamphlet: Look for path to `awk'.
Instantiate src/hyper/presea.
---
src/ChangeLog | 5 +++++
src/algebra/Makefile.in | 4 +---
src/algebra/Makefile.pamphlet | 4 +---
src/algebra/color.spad.pamphlet | 2 +-
src/algebra/net.spad.pamphlet | 2 +-
src/algebra/syntax.spad.pamphlet | 1 +
src/hyper/presea | 28 ----------------------------
src/hyper/presea.in | 28 ++++++++++++++++++++++++++++
8 files changed, 38 insertions(+), 36 deletions(-)
delete mode 100755 src/hyper/presea
create mode 100755 src/hyper/presea.in
(limited to 'src')
diff --git a/src/ChangeLog b/src/ChangeLog
index 5a972fef..b4ee3f7b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-26 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * hyper/presea.in: Rename from hyper/presea. `awk' is not
+ substitued at configuration time.
+
2008-10-25 Gabriel Dos Reis <gdr@cs.tamu.edu>
* clef/edible.c: #include "cfuns.h" for oa_getenv use.
diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in
index 130b228f..7d7846c0 100644
--- a/src/algebra/Makefile.in
+++ b/src/algebra/Makefile.in
@@ -919,13 +919,13 @@ check:
+.PRECIOUS: $(OUT)/%.$(FASLEXT)
${OUT}/%.$(FASLEXT): %.NRLIB/code.$(FASLEXT)
cp $< $@
.PRECIOUS: %.NRLIB/code.$(FASLEXT)
%.NRLIB/code.$(FASLEXT): %.spad
- @ rm -rf $*.NRLIB
${INTERPSYS} --strap=strap --system-algebra --optimize=2 --compile $<
# Compile bootstrap file to machine object code, and the result
# immediately available for AXIOMsys consumption.
@@ -966,11 +966,9 @@ $(axiom_build_texdir)/diagrams.tex: $(axiom_src_docdir)/diagrams.tex
@cp -p $< $@
SPADPRSR.NRLIB/code.$(FASLEXT): spad-parser.spad
- @ rm -rf SPADPRSR.NRLIB
${INTERPSYS} --system-algebra --compile $<
PARSER.NRLIB/code.$(FASLEXT): script-parser.spad
- @ rm -rf PARSER.NRLIB
${INTERPSYS} --system-algebra --compile $<
diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet
index 1a960216..25269dd2 100644
--- a/src/algebra/Makefile.pamphlet
+++ b/src/algebra/Makefile.pamphlet
@@ -1851,6 +1851,7 @@ deriving the dependencies by scanning the ``Loading ...'' messages.
<<genericDotOfiles>>=
+.PRECIOUS: $(OUT)/%.$(FASLEXT)
${OUT}/%.$(FASLEXT): %.NRLIB/code.$(FASLEXT)
cp $< $@
@@ -1860,7 +1861,6 @@ ${OUT}/%.$(FASLEXT): %.NRLIB/code.$(FASLEXT)
.PRECIOUS: %.NRLIB/code.$(FASLEXT)
%.NRLIB/code.$(FASLEXT): %.spad
- @ rm -rf $*.NRLIB
${INTERPSYS} --strap=strap --system-algebra --optimize=2 --compile $<
@
@@ -1917,11 +1917,9 @@ $(axiom_build_texdir)/diagrams.tex: $(axiom_src_docdir)/diagrams.tex
<<genericDOCfiles>>
SPADPRSR.NRLIB/code.$(FASLEXT): spad-parser.spad
- @ rm -rf SPADPRSR.NRLIB
${INTERPSYS} --system-algebra --compile $<
PARSER.NRLIB/code.$(FASLEXT): script-parser.spad
- @ rm -rf PARSER.NRLIB
${INTERPSYS} --system-algebra --compile $<
@
diff --git a/src/algebra/color.spad.pamphlet b/src/algebra/color.spad.pamphlet
index a8a0e329..74025c2d 100644
--- a/src/algebra/color.spad.pamphlet
+++ b/src/algebra/color.spad.pamphlet
@@ -44,7 +44,7 @@ RGBColorModel(T: AbelianMonoid): Category == AbelianMonoid with
++ This category defines the common interface for RGB color spaces.
RGBColorSpace(T: AbelianMonoid): Category == RGBColorModel T with
whitePoint: %
- ++ whitepoint is the contant indicating the white point
+ ++ whitePoint is the contant indicating the white point
++ of this color space.
@
diff --git a/src/algebra/net.spad.pamphlet b/src/algebra/net.spad.pamphlet
index f73b278c..efde9e0d 100644
--- a/src/algebra/net.spad.pamphlet
+++ b/src/algebra/net.spad.pamphlet
@@ -129,7 +129,7 @@ InputBinaryFile(): Public == Private where
eof?: % -> Boolean
++ eof?(ifile) holds when the last read reached end of file.
isOpen?: % -> Boolean
- ++ open?(ifile) holds if `ifile' is in open state.
+ ++ isOpen?(ifile) holds if `ifile' is in open state.
position: % -> SingleInteger
++ position(f) returns the current byte-position in the file `f'.
position!: (%,SingleInteger) -> SingleInteger
diff --git a/src/algebra/syntax.spad.pamphlet b/src/algebra/syntax.spad.pamphlet
index be0fc84b..a649c1f5 100644
--- a/src/algebra/syntax.spad.pamphlet
+++ b/src/algebra/syntax.spad.pamphlet
@@ -373,6 +373,7 @@ import CoercibleTo Syntax
AbstractSyntaxCategory(): Category ==
Join(SetCategory, CoercibleTo Syntax) with
coerce: Syntax -> %
+ ++ coerce(s) parses syntax object `s' as a Spad construct.
add
coerce(x: %): Syntax ==
x pretend Syntax
diff --git a/src/hyper/presea b/src/hyper/presea
deleted file mode 100755
index fb9af4db..00000000
--- a/src/hyper/presea
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/awk -f
-BEGIN {n=0;m=0
-}
-
-{
- a[n] = $0;
- n=n+1;
- j=split($0,b,"{");
- if ( j>= 2)
- m=m+substr(b[j],1,length(b[j])-1);
-}
-
-END {
- if (case==1)
- printf ("\\begin{page}{staticsearchpage}{No matches found}\n")
- else if ( n==0 || m==0 )
- printf ("\\begin{page}{staticsearchpage}{No matches found for {\\em %s}}\n",expr)
- else
- printf ("\\begin{page}{staticsearchpage}{%d matches found in %d pages for {\\em %s}}\n",m,n,expr);
- printf ("Matches\\tab{8}in Page\n");
- printf "\\beginscroll\n";
- printf "\\beginmenu\n";
- for(i=0;i<n;i++) printf ("%s\n",a[i]);
- printf "\\endmenu\n";
- printf "\\endscroll\n";
- printf "\\end{page}\n";
-}
-
diff --git a/src/hyper/presea.in b/src/hyper/presea.in
new file mode 100755
index 00000000..c8ab71c1
--- /dev/null
+++ b/src/hyper/presea.in
@@ -0,0 +1,28 @@
+#!@HOST_AWK@ -f
+BEGIN {n=0;m=0
+}
+
+{
+ a[n] = $0;
+ n=n+1;
+ j=split($0,b,"{");
+ if ( j>= 2)
+ m=m+substr(b[j],1,length(b[j])-1);
+}
+
+END {
+ if (case==1)
+ printf ("\\begin{page}{staticsearchpage}{No matches found}\n")
+ else if ( n==0 || m==0 )
+ printf ("\\begin{page}{staticsearchpage}{No matches found for {\\em %s}}\n",expr)
+ else
+ printf ("\\begin{page}{staticsearchpage}{%d matches found in %d pages for {\\em %s}}\n",m,n,expr);
+ printf ("Matches\\tab{8}in Page\n");
+ printf "\\beginscroll\n";
+ printf "\\beginmenu\n";
+ for(i=0;i<n;i++) printf ("%s\n",a[i]);
+ printf "\\endmenu\n";
+ printf "\\endscroll\n";
+ printf "\\end{page}\n";
+}
+
--
cgit v1.2.3