~mdw
/
sod
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src/method-{proto,impl}.lisp: Abstract out the receiver type.
[sod]
/
doc
/
parsing.tex
diff --git
a/doc/parsing.tex
b/doc/parsing.tex
index
c694ef8
..
22960ee
100644
(file)
--- a/
doc/parsing.tex
+++ b/
doc/parsing.tex
@@
-63,6
+63,11
@@
consumed any input items.
\dhead{gf}{setf (position-aware-stream-column @<stream>) @<fixnum>}}
\end{describe*}
\dhead{gf}{setf (position-aware-stream-column @<stream>) @<fixnum>}}
\end{describe*}
+\begin{describe*}
+ {\dhead{cls}{position-aware-input-stream \&key :file :line :column}
+ \dhead{cls}{position-aware-output-stream \&key :file :line :column}}
+\end{describe*}
+
\begin{describe}{gf}{stream-pathname @<stream> @> @<pathname-or-nil>}
\begin{describe}{meth}{stream}
{stream-pathname (@<stream> stream) @> nil}
\begin{describe}{gf}{stream-pathname @<stream> @> @<pathname-or-nil>}
\begin{describe}{meth}{stream}
{stream-pathname (@<stream> stream) @> nil}
@@
-136,6
+141,9
@@
consumed any input items.
{information-with-location (condition-with-location information) \\ \>
\&key :location}
\dhead{cls}
{information-with-location (condition-with-location information) \\ \>
\&key :location}
\dhead{cls}
+ {enclosing-condition-with-location (condition) \\ \>
+ \&key :location}
+ \dhead{cls}
{enclosing-error-with-location
(enclosing-error-with-location error) \\ \>
\&key :condition :location}
{enclosing-error-with-location
(enclosing-error-with-location error) \\ \>
\&key :condition :location}
@@
-180,7
+188,8
@@
consumed any input items.
\dhead{fun}{cerror-with-location @<floc> @<continue-string>
@<datum> \&rest @<arguments>}
\dhead{fun}{cerror*-with-location @<floc> @<datum> \&rest @<arguments>}
\dhead{fun}{cerror-with-location @<floc> @<continue-string>
@<datum> \&rest @<arguments>}
\dhead{fun}{cerror*-with-location @<floc> @<datum> \&rest @<arguments>}
- \dhead{fun}{warn-with-location @<floc> @<datum> \&rest @<arguments>}}
+ \dhead{fun}{warn-with-location @<floc> @<datum> \&rest @<arguments>}
+ \dhead{fun}{info-with-location @<floc> @<datum> \&rest @<arguments>}}
\end{describe*}
\begin{describe*}
\end{describe*}
\begin{describe*}
@@
-458,6
+467,10
@@
file-location protocols.
the scanner will update the location as it reads its input.
\end{describe}
the scanner will update the location as it reads its input.
\end{describe}
+\begin{describe}{cls}
+ {charbuf-scanner-stream (character-scanner-stream) \&key :scanner}
+\end{describe}
+
\begin{describe}{cls}{charbuf-scanner-place}
The class of place objects captured by a charbuf scanner.
\end{describe}
\begin{describe}{cls}{charbuf-scanner-place}
The class of place objects captured by a charbuf scanner.
\end{describe}
@@
-513,6
+526,11
@@
file-location protocols.
{token-scanner () \&key :filename (:line 1) (:column 0)}
\end{describe}
{token-scanner () \&key :filename (:line 1) (:column 0)}
\end{describe}
+\begin{describe*}
+ {\dhead{gf}{setf (scanner-line @<scanner>) @<fixnum>}
+ \dhead{gf}{setf (scanner-column @<scanner>) @<fixnum>}}
+\end{describe*}
+
\begin{describe}{gf}{token-type @<scanner> @> @<type>}
\end{describe}
\begin{describe}{gf}{token-type @<scanner> @> @<type>}
\end{describe}
@@
-614,6
+632,9
@@
file-location protocols.
\-\nlret @<value>^*}
\end{describe}
\-\nlret @<value>^*}
\end{describe}
+\begin{describe}{cls}{list-parser () \&key :var}
+\end{describe}
+
\subsection{Basic parser syntax} \label{sec:parsing.syntax.basic}
\subsection{Basic parser syntax} \label{sec:parsing.syntax.basic}
@@
-729,6
+750,10
@@
file-location protocols.
\begin{describe}{gf}{parser-current-char @<context> @> @<form>}
\end{describe}
\begin{describe}{gf}{parser-current-char @<context> @> @<form>}
\end{describe}
+\begin{describe}{cls}
+ {string-parser (character-parser-context) \&key :string :index :length}
+\end{describe}
+
\begin{describe}{parseform}
{if-char (@[@<result-var>@]) @<condition> @<consequent> @<alternative>}
\end{describe}
\begin{describe}{parseform}
{if-char (@[@<result-var>@]) @<condition> @<consequent> @<alternative>}
\end{describe}
@@
-778,7
+803,7
@@
file-location protocols.
\begin{describe}{cls}{scanner-context () \&key :scanner}
\end{describe}
\begin{describe}{cls}{scanner-context () \&key :scanner}
\end{describe}
-\begin{describe}{gf}{parse-scanner @<context> @> @<symbol>}
+\begin{describe}{gf}{parse
r
-scanner @<context> @> @<symbol>}
\end{describe}
\begin{describe}{cls}
\end{describe}
\begin{describe}{cls}
@@
-794,15
+819,6
@@
file-location protocols.
\subsection{Expression parsing} \label{sec:parsing.syntax.expression}
\subsection{Expression parsing} \label{sec:parsing.syntax.expression}
-\begin{describe}{gf}{push-operator @<operator> @<state>}
-\end{describe}
-
-\begin{describe}{gf}{push-value @<value> @<state>}
-\end{describe}
-
-\begin{describe}{gf}{apply-operator @<operator> @<state>}
-\end{describe}
-
\begin{describe}{gf}{operator-push-action @<left> @<right>}
\end{describe}
\begin{describe}{gf}{operator-push-action @<left> @<right>}
\end{describe}
@@
-857,8
+873,7
@@
file-location protocols.
\end{describe*}
\begin{describe*}
\end{describe*}
\begin{describe*}
- {\dhead{cls}{parenthesis () \&key :tag}
- \dhead{cls}{open-parenthesis (parenthesis prefix-operator) \&key :tag}
+ {\dhead{cls}{open-parenthesis (parenthesis prefix-operator) \&key :tag}
\dhead{cls}{close-parenthesis (parenthesis) \&key :tag}}
\end{describe*}
\dhead{cls}{close-parenthesis (parenthesis) \&key :tag}}
\end{describe*}