--- cml2.txt.orig Fri Jun 9 20:18:58 2000 +++ cml2.txt Sat Jun 10 00:47:27 2000 @@ -170,7 +170,7 @@ EOF, the input source is immediately popped back to the including file. -Comments are sopported, and run from a # to end-of-line. +Comments are supported, and run from a # to end-of-line. Here is a BNF of the grammar. Following it, each language element will be described in detail. @@ -337,7 +337,7 @@ | | '(' ')' -Operators have the precedence implies by the above productions. From +Operators have the precedence implied by the above productions. From least to most binding, precedence classes are: 1: + - @@ -392,7 +392,7 @@ A source statement declares a file to be inserted in place of the source statement in the file, and treated as if the entire contents of -that file were present in the current file at the point of ther source +that file were present in the current file at the point of their source statement. Any implementation of CML2 must allow source statements to be nested @@ -806,7 +806,7 @@ m | n m n n | n n n -The operator precedence implies by the BNF above is implemented in the +The operator precedence implied by the BNF above is implemented in the parser. IV.4 Symbol Assignment and Side Effects @@ -969,7 +969,7 @@ -h Set the location to which cmlconfigure should write its file of C - macros. There is no default; if there is no -s option no macro file + macros. There is no default; if there is no -h option no macro file is written. -i @@ -990,7 +990,7 @@ Set the location to which cmlconfigure should write its defconfig file of shell variable settings. Explicit n values are saved. This file will be loadable by cmlconfigure. There is no default; - if there is no -s option no defcondig is written. + if there is no -s option no defconfig is written. -t Force tty (line-oriented) mode. @@ -1052,7 +1052,7 @@ A macrofile is a series of C #define macro lines corresponding to configuration symbols. The macro corresponding to as symbol has the -same name as that symbol, prefixed id there is a "prefix" declaration +same name as that symbol, prefixed if there is a "prefix" declaration in the rulebase. If a boolean or tristate symbol has the value y, CML2 generates a line @@ -1061,15 +1061,15 @@ If a boolean or tristate symbol has the value n, CML2 generates a line undefining the corresponding macro. -If a boolean or tristate symbol has the value n, CML2 generates two lines. +If a boolean or tristate symbol has the value m, CML2 generates two lines. The first undefines the corresponding macro. The second defines a -macro with ther same name and the suffix "_MODULE" top be 1. +macro with the same name and the suffix "_MODULE" to be 1. Each decimal and hexadecimal symbol generates a line defining the corresponding macro to the value of the numeric literal. Each string symbol generates a line defining the corresponding macro -to the value of the string, as a C string kiteral in double quotes. +to the value of the string, as a C string literal in double quotes. These format conventions are identical to CML1's.