https://gcc.gnu.org/g:b16824e10d9ae6c7740fc01424e192ae3448fc9a
commit r14-11051-gb16824e10d9ae6c7740fc01424e192ae3448fc9a Author: Gaius Mulley <gaiusm...@gmail.com> Date: Tue Dec 3 14:39:03 2024 +0000 [PATCH] modula2: Tidyup gm2-compiler/M2MetaError.mod This patch is a tidyup for gm2-compiler/M2MetaError.mod. gcc/m2/ChangeLog: * gm2-compiler/M2MetaError.mod (op): Alphabetically order each case label and comment. (cherry picked from commit 7fa9fd47f161d6b8177439ae2b46a2048a5eaa24) Signed-off-by: Gaius Mulley <gaiusm...@gmail.com> Diff: --- gcc/m2/gm2-compiler/M2MetaError.mod | 51 +++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/gcc/m2/gm2-compiler/M2MetaError.mod b/gcc/m2/gm2-compiler/M2MetaError.mod index 007c10b28bdf..e9f3127925c4 100644 --- a/gcc/m2/gm2-compiler/M2MetaError.mod +++ b/gcc/m2/gm2-compiler/M2MetaError.mod @@ -1684,8 +1684,9 @@ END copySym ; (* - op := {'a'|'q'|'t'|'d'|'n'|'s'|'B'|'D'|'F'|'G'|'H'|'M'|'U'|'E'|'V'|'W'|'A'} then =: - op := {'a'|'q'|'t'|'d'|'n'|'s'| 'u' |'D'|'F'|'G'|'M'|'U'|'E'|'W'} then =: + op := {'!'|'a'|'c'|'d'|'k'|'q'|'t'|'p'|'n'|'s'|'u'| + 'A'|'B'|'C'|'D'|'E'|'F'|'G'|'H'|'K'|'M'|'N'| + 'O'|'P'|'Q'|'R'|'S'|'T'|'U'|'V'|'W'|'X'|'Y'|'Z'} then =: *) PROCEDURE op (VAR eb: errorBlock; @@ -1701,43 +1702,43 @@ BEGIN '!': eb.positive := NOT eb.positive | 'a': doName (eb, sym, bol) | + 'c': eb.currentCol := readColor (eb) ; + DEC (eb.ini) | + 'd': doDesc (eb, sym, bol) | + 'k': unquotedKeyword (eb) ; + DEC (eb.ini) | 'q': doQualified (eb, sym, bol) | 't': doType (eb, sym, bol) | - 'd': doDesc (eb, sym, bol) | + 'p': popColor (eb) | 'n': doNumber (eb, sym, bol) | - 'N': doCount (eb, sym, bol) | 's': doSkipType (eb, sym, bol) | - 'B': declaredType (eb, sym, bol) | - 'H': declaredFull (eb, sym, bol) | - 'V': declaredVar (eb, sym, bol) | - 'G': declaredFor (eb, sym, bol) | - 'M': declaredMod (eb, sym, bol) | - 'D': declaredDef (eb, sym, bol) | - 'U': used (eb, sym, bol) | - 'E': eb.type := error | + 'u': eb.quotes := FALSE | 'A': eb.type := aborta ; seenAbort := TRUE | - 'W': eb.type := warning | - 'O': eb.type := note | + 'B': declaredType (eb, sym, bol) | 'C': eb.chain := TRUE | - 'R': eb.root := TRUE | - 'S': doGetSkipType (eb, sym, bol) | - 'T': doGetType (eb, sym, bol) | - 'P': pushColor (eb) | - 'p': popColor (eb) | - 'c': eb.currentCol := readColor (eb) ; + 'D': declaredDef (eb, sym, bol) | + 'E': eb.type := error | + 'F': filename (eb) ; DEC (eb.ini) | + 'G': declaredFor (eb, sym, bol) | + 'H': declaredFull (eb, sym, bol) | 'K': keyword (eb) ; DEC (eb.ini) | - 'k': unquotedKeyword (eb) ; - DEC (eb.ini) | + 'M': declaredMod (eb, sym, bol) | + 'N': doCount (eb, sym, bol) | + 'O': eb.type := note | + 'P': pushColor (eb) | 'Q': resetDictionary | + 'R': eb.root := TRUE | + 'S': doGetSkipType (eb, sym, bol) | + 'T': doGetType (eb, sym, bol) | + 'U': used (eb, sym, bol) | + 'V': declaredVar (eb, sym, bol) | + 'W': eb.type := warning | 'X': pushOutput (eb) | 'Y': processDefine (eb) | 'Z': popOutput (eb) | - 'F': filename (eb) ; - DEC (eb.ini) | - 'u': eb.quotes := FALSE | ':': ifNonNulThen (eb, sym) ; DEC (eb.ini) | '1': InternalError ('incorrect format spec, expecting %1 rather than % spec 1') |