diff --git a/doc/cmdref.sgm b/doc/cmdref.sgm index 530ab48..a6d2e06 100644 --- a/doc/cmdref.sgm +++ b/doc/cmdref.sgm @@ -58,8 +58,8 @@ Normal labels are defined by prefixing a line with the label name and then a colon (e.g., label:). Anonymous labels - are defined by prefixing a line with an asterisk - (e.g., *). + are defined by prefixing a line with just a colon or + with an asterisk. Temporary labels are only reachable from inside the @@ -103,9 +103,9 @@ bytes of 16-bit values, respectively. - Use brackets [ ] instead of parentheses ( ) when grouping - arithmetic operations, as the parentheses are needed for the - indirect addressing modes. + You may use parentheses ( ), brackets [ ], or curly braces { } + to group arithmetic expressions. Note that a fully parenthesized + expression will be interpreted as an indirect addressing mode. Examples: diff --git a/doc/ophismanual.pdf b/doc/ophismanual.pdf index f40b8f0..3d87313 100644 Binary files a/doc/ophismanual.pdf and b/doc/ophismanual.pdf differ diff --git a/doc/ophismanual.sgm b/doc/ophismanual.sgm index fc31d25..4a79717 100644 --- a/doc/ophismanual.sgm +++ b/doc/ophismanual.sgm @@ -20,7 +20,7 @@ Programming with Ophis MichaelMartin - 2006-2024Michael Martin + 2006-2026Michael Martin &pre1; diff --git a/doc/preface.sgm b/doc/preface.sgm index 959b30c..33dc2a9 100644 --- a/doc/preface.sgm +++ b/doc/preface.sgm @@ -87,7 +87,9 @@ that, enough bug reports and bug fixes had trickled in to justify a fresh release, and 2.2 was published in 2024—a lightly polished update that now fit more neatly - into the Python toolchains of the 2020s. + into the Python toolchains of the 2020s. 2.3, in 2026, fixed up + some infelicities and inconveniences that I finally decided I + didn't need to put up with any more. In the twenty years since I first started this project, I've diff --git a/doc/tutor2.sgm b/doc/tutor2.sgm index 124e42a..4aae742 100644 --- a/doc/tutor2.sgm +++ b/doc/tutor2.sgm @@ -57,8 +57,8 @@ _next: .word 0 ; End of program Anonymous labels are a way to handle short-ranged branches without having to come up with names for the then and else branches, for brief loops, and other such purposes. To define - an anonymous label, use an asterisk. To refer to an anonymous - label, use a series of + + an anonymous label, use a bare colon or an asterisk. To refer + to an anonymous label, use a series of + or - signs. + refers to the next anonymous label, ++ the label after that, etc. Likewise, - is the most @@ -74,7 +74,7 @@ _next: .word 0 ; End of program jsr $ffd2 inx bne - -* rts +: rts diff --git a/doc/tutor6.sgm b/doc/tutor6.sgm index d877462..79636f0 100644 --- a/doc/tutor6.sgm +++ b/doc/tutor6.sgm @@ -100,7 +100,7 @@ _done: rts - [ ]Parenthesized expressions + { } [ ] ( )Parenthesized expressions < >Byte selection (low, high) * /Multiply, divide + -Add, subtract @@ -108,10 +108,9 @@ _done: rts + - Note that brackets, not parentheses, are used to group arithmetic - operations. Parentheses are reserved for the indirect addressing - modes. + Until version 2.3, only brackets were allowed to parenthesize expressions.