#297 Allow uppercase Modula identifiers to contain digits.

ScintillaOrg · Dec 21, 2024 · 7b0a1d7 · 7b0a1d7
1 parent d0ef4d2
commit 7b0a1d7
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 1 deletion.
diff --git a/doc/LexillaHistory.html b/doc/LexillaHistory.html
@@ -600,6 +600,10 @@ <h3>
 	Released 18 December 2024.
 	</li>
 	<li>
+	Modula-3: Allow digits in uppercase identifiers.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/297">Issue #297</a>.
+	</li>
+	<li>
 	Pascal: Fix asm style extending past end.
 	<a href="https://github.com/ScintillaOrg/lexilla/issues/295">Issue #295</a>.
 	</li>

diff --git a/lexers/LexModula.cxx b/lexers/LexModula.cxx
@@ -366,7 +366,7 @@ static void ColouriseModulaDoc(	Sci_PositionU startPos,
 				if( isupper( sc.ch ) && isupper( sc.chNext ) ) {
 					for( i = 0; i < BUFLEN - 1; i++ ) {
 						buf[i] = sc.GetRelative(i);
-						if( !isalpha( buf[i] ) && !(buf[i] == '_') )
+						if( !(IsAlphaNumeric( buf[i] ) || buf[i] == '_') )
 							break;
 					}
 					kl = i;

diff --git a/test/examples/modula/Issue297.m3 b/test/examples/modula/Issue297.m3
@@ -0,0 +1,6 @@
+INTERFACE Issue297;
+
+TYPE
+  INTEGER32 = [-16_7fffffff-1 .. 16_7fffffff];
+
+END Issue297.
diff --git a/test/examples/modula/Issue297.m3.folded b/test/examples/modula/Issue297.m3.folded
@@ -0,0 +1,7 @@
+ 0 400 400   INTERFACE Issue297;
+ 1 400 400   
+ 0 400 400   TYPE
+ 0 400 400     INTEGER32 = [-16_7fffffff-1 .. 16_7fffffff];
+ 1 400 400   
+ 0 400 3ff   END Issue297.
+ 1 3ff 3ff   
diff --git a/test/examples/modula/Issue297.m3.styled b/test/examples/modula/Issue297.m3.styled
@@ -0,0 +1,6 @@
+{4}INTERFACE{0} Issue297{16};{0}
+
+{4}TYPE{0}
+  INTEGER32 {16}={0} {16}[-{7}16_7fffffff{16}-{6}1{0} {16}..{0} {7}16_7fffffff{16}];{0}
+
+{4}END{0} Issue297{16}.{0}