[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gawk-diffs] [SCM] gawk branch, master, updated. 507adb95a9a4eec0e2c8410
From: |
Arnold Robbins |
Subject: |
[gawk-diffs] [SCM] gawk branch, master, updated. 507adb95a9a4eec0e2c84102482d0db9c484e1a2 |
Date: |
Sat, 03 Nov 2012 21:33:55 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".
The branch, master has been updated
via 507adb95a9a4eec0e2c84102482d0db9c484e1a2 (commit)
from 8642601a56e6652d5d913cebca84a1ad0351b6e4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=507adb95a9a4eec0e2c84102482d0db9c484e1a2
commit 507adb95a9a4eec0e2c84102482d0db9c484e1a2
Author: Arnold D. Robbins <address@hidden>
Date: Sat Nov 3 23:33:30 2012 +0200
And images in gawk.texi fixed up.
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 703673d..c05f558 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -5,6 +5,12 @@
api-figure1.png, api-figure2.png, api-figure3.png: New files.
* Makefile.am (EXTRA_DIST): Update.
+ * gawk.texi: Fix up images.
+ * general-program.pdf, process-flow.pdf: Removed.
+ * general-program.png, process-flow.png,
+ general-program.txt, process-flow.txt: New files.
+ * Makefile.am (EXTRA_DIST): Update.
+
2012-10-31 Arnold D. Robbins <address@hidden>
* api-figure1.eps, api-figure1.fig, api-figure1.pdf,
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 9f7e278..d2fde28 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -33,8 +33,10 @@ EXTRA_DIST = ChangeLog ChangeLog.0 README.card ad.block
setter.outline \
api-figure1.eps api-figure1.fig api-figure1.png api-figure1.txt \
api-figure2.eps api-figure2.fig api-figure2.png api-figure2.txt \
api-figure3.eps api-figure3.fig api-figure3.png api-figure3.txt \
- general-program.eps general-program.fig general-program.pdf \
- process-flow.eps process-flow.fig process-flow.pdf \
+ general-program.eps general-program.fig general-program.png \
+ general-program.txt \
+ process-flow.eps process-flow.fig process-flow.png \
+ process-flow.txt \
macros colors no.colors $(man_MANS) \
lflashlight-small.xpic lflashlight.eps lflashlight.pdf \
rflashlight-small.xpic rflashlight.eps rflashlight.pdf \
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 791bc3e..3cf7d0e 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -277,8 +277,10 @@ EXTRA_DIST = ChangeLog ChangeLog.0 README.card ad.block
setter.outline \
api-figure1.eps api-figure1.fig api-figure1.png api-figure1.txt \
api-figure2.eps api-figure2.fig api-figure2.png api-figure2.txt \
api-figure3.eps api-figure3.fig api-figure3.png api-figure3.txt \
- general-program.eps general-program.fig general-program.pdf \
- process-flow.eps process-flow.fig process-flow.pdf \
+ general-program.eps general-program.fig general-program.png \
+ general-program.txt \
+ process-flow.eps process-flow.fig process-flow.png \
+ process-flow.txt \
macros colors no.colors $(man_MANS) \
lflashlight-small.xpic lflashlight.eps lflashlight.pdf \
rflashlight-small.xpic rflashlight.eps rflashlight.pdf \
diff --git a/doc/gawk.info b/doc/gawk.info
index 5dd2f2d..baa064d 100644
--- a/doc/gawk.info
+++ b/doc/gawk.info
@@ -23750,12 +23750,13 @@ D.1 What a Program Does
=======================
At the most basic level, the job of a program is to process some input
-data and produce results.
+data and produce results. See *note figure-general-flow::.
- _______
- +------+ / \ +---------+
- | Data | -----> < Program > -----> | Results |
- +------+ \_______/ +---------+
+ _______
++------+ / \ +---------+
+| Data | -----> < Program > -----> | Results |
++------+ \_______/ +---------+
+Figure D.1: General Program Flow
The "program" in the figure can be either a compiled program(1)
(such as `ls'), or it may be "interpreted". In the latter case, a
@@ -23763,19 +23764,20 @@ machine-executable program such as `awk' reads your
program, and then
uses the instructions in your program to process the data.
When you write a program, it usually consists of the following, very
-basic set of steps:
-
- ______
- +----------------+ / More \ No +----------+
- | Initialization | -------> < Data > -------> | Clean Up |
- +----------------+ ^ \ ? / +----------+
- | +--+-+
- | | Yes
- | |
- | V
- | +---------+
- +-----+ Process |
- +---------+
+basic set of steps, as shown in *note figure-process-flow:::
+
+ ______
++----------------+ / More \ No +----------+
+| Initialization | -------> < Data > -------> | Clean Up |
++----------------+ ^ \ ? / +----------+
+ | +--+-+
+ | | Yes
+ | |
+ | V
+ | +---------+
+ +-----+ Process |
+ +---------+
+Figure D.2: Basic Program Steps
Initialization
These are the things you do before actually starting to process
@@ -26067,7 +26069,7 @@ Index
* Aho, Alfred: History. (line 17)
* alarm clock example program: Alarm Program. (line 9)
* alarm.awk program: Alarm Program. (line 29)
-* algorithms: Basic High Level. (line 66)
+* algorithms: Basic High Level. (line 68)
* Alpha (DEC): Manual History. (line 28)
* amazing awk assembler (aaa): Glossary. (line 12)
* amazingly workable formatter (awf): Glossary. (line 25)
@@ -26473,7 +26475,7 @@ Index
(line 60)
* compatibility mode (gawk), specifying: Options. (line 95)
* compiled programs <1>: Glossary. (line 165)
-* compiled programs: Basic High Level. (line 14)
+* compiled programs: Basic High Level. (line 15)
* compiling gawk for Cygwin: Cygwin. (line 6)
* compiling gawk for MS-DOS and MS-Windows: PC Compiling. (line 13)
* compiling gawk for VMS: VMS Compilation. (line 6)
@@ -26573,7 +26575,7 @@ Index
* dark corner, strings, storing: Records. (line 196)
* dark corner, value of ARGV[0]: Auto-set. (line 35)
* data, fixed-width: Constant Size. (line 9)
-* data-driven languages: Basic High Level. (line 83)
+* data-driven languages: Basic High Level. (line 85)
* database, group, reading: Group Functions. (line 6)
* database, users, reading: Passwd Functions. (line 6)
* date utility, GNU: Time Functions. (line 17)
@@ -26948,7 +26950,7 @@ Index
* field separators, regular expressions as: Field Separators. (line 50)
* field separators, See Also OFS: Changing Fields. (line 64)
* field separators, spaces as: Cut Program. (line 109)
-* fields <1>: Basic High Level. (line 71)
+* fields <1>: Basic High Level. (line 73)
* fields <2>: Fields. (line 6)
* fields: Reading Files. (line 14)
* fields, adding: Changing Fields. (line 53)
@@ -27406,7 +27408,7 @@ Index
(line 6)
* internationalizing a program: Explaining gettext. (line 6)
* interpreted programs <1>: Glossary. (line 365)
-* interpreted programs: Basic High Level. (line 14)
+* interpreted programs: Basic High Level. (line 15)
* interval expressions: Regexp Operators. (line 116)
* inventory-shipped file: Sample Data Files. (line 32)
* isarray() function (gawk): Type Functions. (line 11)
@@ -27441,7 +27443,7 @@ Index
* l debugger command (alias for list): Miscellaneous Debugger Commands.
(line 74)
* labels.awk program: Labels Program. (line 51)
-* languages, data-driven: Basic High Level. (line 83)
+* languages, data-driven: Basic High Level. (line 85)
* Laurie, Dirk: Changing Precision. (line 6)
* LC_ALL locale category: Explaining gettext. (line 120)
* LC_COLLATE locale category: Explaining gettext. (line 93)
@@ -27928,7 +27930,7 @@ Index
* programming languages, data-driven vs. procedural: Getting Started.
(line 12)
* Programming languages, Java: Glossary. (line 388)
-* programming, basic steps: Basic High Level. (line 19)
+* programming, basic steps: Basic High Level. (line 20)
* programming, concepts: Basic Concepts. (line 6)
* pwcat program: Passwd Functions. (line 23)
* q debugger command (alias for quit): Miscellaneous Debugger Commands.
@@ -27970,7 +27972,7 @@ Index
* record separators, changing: Records. (line 81)
* record separators, regular expressions as: Records. (line 117)
* record separators, with multiline records: Multiple Line. (line 10)
-* records <1>: Basic High Level. (line 71)
+* records <1>: Basic High Level. (line 73)
* records: Reading Files. (line 14)
* records, multiline: Multiple Line. (line 6)
* records, printing: Print. (line 22)
@@ -28954,11 +28956,13 @@ Ref: Derived Files-Footnote-3951209
Node: Future Extensions951307
Node: Basic Concepts952794
Node: Basic High Level953475
-Ref: Basic High Level-Footnote-1957510
-Node: Basic Data Typing957695
-Node: Glossary961050
-Node: Copying986361
-Node: GNU Free Documentation License1023918
-Node: Index1049055
+Ref: figure-general-flow953746
+Ref: figure-process-flow954345
+Ref: Basic High Level-Footnote-1957574
+Node: Basic Data Typing957759
+Node: Glossary961114
+Node: Copying986425
+Node: GNU Free Documentation License1023982
+Node: Index1049119
End Tag Table
diff --git a/doc/gawk.texi b/doc/gawk.texi
index 0970011..5969517 100644
--- a/doc/gawk.texi
+++ b/doc/gawk.texi
@@ -31478,19 +31478,22 @@ other introductory texts that you should refer to
instead.)
@cindex processing data
At the most basic level, the job of a program is to process
-some input data and produce results.
+some input data and produce results. See @ref{figure-general-flow}.
address@hidden
address@hidden
address@hidden iftex
address@hidden
address@hidden
- _______
-+------+ / \ +---------+
-| Data | -----> < Program > -----> | Results |
-+------+ \_______/ +---------+
address@hidden example
address@hidden ifnottex
address@hidden Figure,figure-general-flow
address@hidden Program Flow}
address@hidden
address@hidden @image{general-program, , , General program flow, txt}
address@hidden ifinfo
address@hidden
address@hidden @image{general-program, , , General program flow, png}
address@hidden ifhtml
address@hidden
address@hidden
address@hidden @image{general-program, , , General program flow}
address@hidden ifnothtml
address@hidden ifnotinfo
address@hidden float
@cindex compiled programs
@cindex interpreted programs
@@ -31506,26 +31509,23 @@ instructions in your program to process the data.
@cindex programming, basic steps
When you write a program, it usually consists
-of the following, very basic set of steps:
+of the following, very basic set of steps, as shown
+in @ref{figure-process-flow}:
address@hidden
address@hidden
address@hidden iftex
address@hidden
address@hidden
- ______
-+----------------+ / More \ No +----------+
-| Initialization | -------> < Data > -------> | Clean Up |
-+----------------+ ^ \ ? / +----------+
- | +--+-+
- | | Yes
- | |
- | V
- | +---------+
- +-----+ Process |
- +---------+
address@hidden example
address@hidden ifnottex
address@hidden Figure,figure-process-flow
address@hidden Program Steps}
address@hidden
address@hidden @image{process-flow, , , Basic Program Stages, txt}
address@hidden ifinfo
address@hidden
address@hidden @image{process-flow, , , Basic Program Stages, png}
address@hidden ifhtml
address@hidden
address@hidden
address@hidden @image{process-flow, , , Basic Program Stages}
address@hidden ifnothtml
address@hidden ifnotinfo
address@hidden float
@table @asis
@item Initialization
diff --git a/doc/general-program.pdf b/doc/general-program.pdf
deleted file mode 100644
index c79b9ef..0000000
Binary files a/doc/general-program.pdf and /dev/null differ
diff --git a/doc/general-program.png b/doc/general-program.png
new file mode 100644
index 0000000..7737261
Binary files /dev/null and b/doc/general-program.png differ
diff --git a/doc/general-program.txt b/doc/general-program.txt
new file mode 100644
index 0000000..cb85c29
--- /dev/null
+++ b/doc/general-program.txt
@@ -0,0 +1,4 @@
+ _______
++------+ / \ +---------+
+| Data | -----> < Program > -----> | Results |
++------+ \_______/ +---------+
diff --git a/doc/process-flow.pdf b/doc/process-flow.pdf
deleted file mode 100644
index 23d567d..0000000
Binary files a/doc/process-flow.pdf and /dev/null differ
diff --git a/doc/process-flow.png b/doc/process-flow.png
new file mode 100644
index 0000000..97f467f
Binary files /dev/null and b/doc/process-flow.png differ
diff --git a/doc/process-flow.txt b/doc/process-flow.txt
new file mode 100644
index 0000000..d729638
--- /dev/null
+++ b/doc/process-flow.txt
@@ -0,0 +1,11 @@
+ ______
++----------------+ / More \ No +----------+
+| Initialization | -------> < Data > -------> | Clean Up |
++----------------+ ^ \ ? / +----------+
+ | +--+-+
+ | | Yes
+ | |
+ | V
+ | +---------+
+ +-----+ Process |
+ +---------+
-----------------------------------------------------------------------
Summary of changes:
doc/ChangeLog | 6 ++
doc/Makefile.am | 6 ++-
doc/Makefile.in | 6 ++-
doc/gawk.info | 68 ++++++++++++++------------
doc/gawk.texi | 62 ++++++++++++------------
doc/general-program.pdf | Bin 5588 -> 0 bytes
doc/{api-figure3.png => general-program.png} | Bin 8860 -> 6078 bytes
doc/general-program.txt | 4 ++
doc/process-flow.pdf | Bin 6558 -> 0 bytes
doc/{api-figure3.png => process-flow.png} | Bin 8860 -> 7856 bytes
doc/process-flow.txt | 11 ++++
11 files changed, 96 insertions(+), 67 deletions(-)
delete mode 100644 doc/general-program.pdf
copy doc/{api-figure3.png => general-program.png} (54%)
create mode 100644 doc/general-program.txt
delete mode 100644 doc/process-flow.pdf
copy doc/{api-figure3.png => process-flow.png} (54%)
create mode 100644 doc/process-flow.txt
hooks/post-receive
--
gawk
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gawk-diffs] [SCM] gawk branch, master, updated. 507adb95a9a4eec0e2c84102482d0db9c484e1a2,
Arnold Robbins <=