Lexer: Don't try to lex parameter expansions

rail5 · rail5 · commit c07c63d156ee · 2026-07-08T11:52:52.000+08:00
A future update will attempt more fully to lex/parse parameter expansions
For now, just treat them as black boxes to copy from

[notest]
diff --git a/src/flexbison/lexer.l b/src/flexbison/lexer.l
@@ -404,8 +404,6 @@ ANGLEBRACKET_INCLUDE_PATH <([^>])+>
 
 %s BLOCK_MODE
 
-%s PARAMETER_EXPANSION_MODE
-
 %s HEREDOC_MODE
 
 %s BASH_CASE_MODE
@@ -1407,52 +1405,52 @@ function/[ \t]+[a-zA-Z_][a-zA-Z_0-9]* {
 	}
 
 	":" {
-		thisModeStack.push(PARAMETER_EXPANSION_MODE);
+		thisModeStack.push(UNLEXED_PARAMETER_EXPANSION_MODE);
 		emit(EXPANSION_BEGIN, tokenText);
 	}
 
 	"@" {
-		thisModeStack.push(PARAMETER_EXPANSION_MODE);
+		thisModeStack.push(UNLEXED_PARAMETER_EXPANSION_MODE);
 		emit(EXPANSION_BEGIN, tokenText);
 	}
 
 	"%" {
-		thisModeStack.push(PARAMETER_EXPANSION_MODE);
+		thisModeStack.push(UNLEXED_PARAMETER_EXPANSION_MODE);
 		emit(EXPANSION_BEGIN, tokenText);
 	}
 
 	"-" {
-		thisModeStack.push(PARAMETER_EXPANSION_MODE);
+		thisModeStack.push(UNLEXED_PARAMETER_EXPANSION_MODE);
 		emit(EXPANSION_BEGIN, tokenText);
 	}
 
 	"+" {
-		thisModeStack.push(PARAMETER_EXPANSION_MODE);
+		thisModeStack.push(UNLEXED_PARAMETER_EXPANSION_MODE);
 		emit(EXPANSION_BEGIN, tokenText);
 	}
 
 	"=" {
-		thisModeStack.push(PARAMETER_EXPANSION_MODE);
+		thisModeStack.push(UNLEXED_PARAMETER_EXPANSION_MODE);
 		emit(EXPANSION_BEGIN, tokenText);
 	}
 
 	"?" {
-		thisModeStack.push(PARAMETER_EXPANSION_MODE);
+		thisModeStack.push(UNLEXED_PARAMETER_EXPANSION_MODE);
 		emit(EXPANSION_BEGIN, tokenText);
 	}
 
 	"\*" {
-		thisModeStack.push(PARAMETER_EXPANSION_MODE);
+		thisModeStack.push(UNLEXED_PARAMETER_EXPANSION_MODE);
 		emit(EXPANSION_BEGIN, tokenText);
 	}
 
 	"##" {
-		thisModeStack.push(PARAMETER_EXPANSION_MODE);
+		thisModeStack.push(UNLEXED_PARAMETER_EXPANSION_MODE);
 		emit(EXPANSION_BEGIN, tokenText);
 	}
 
 	"#" {
-		thisModeStack.push(PARAMETER_EXPANSION_MODE);
+		thisModeStack.push(UNLEXED_PARAMETER_EXPANSION_MODE);
 		emit(EXPANSION_BEGIN, tokenText);
 	}
 
@@ -1477,13 +1475,6 @@ function/[ \t]+[a-zA-Z_][a-zA-Z_0-9]* {
 	}
 }
 
-<PARAMETER_EXPANSION_MODE>{
-	"}" {
-		thisModeStack.pop();
-		reconsume_token();
-	}
-}
-
 <UNLEXED_PARAMETER_EXPANSION_MODE>{
 	[^}]+ {
 		emit(PARAMETER_EXPANSION_CONTENT, tokenText);

Original file line number	Diff line number	Diff line change
`@@ -404,8 +404,6 @@ ANGLEBRACKET_INCLUDE_PATH <([^>])+>`
`404`	`404`
`405`	`405`	`%s BLOCK_MODE`
`406`	`406`
`407`		`-%s PARAMETER_EXPANSION_MODE`
`408`		`-`
`409`	`407`	`%s HEREDOC_MODE`
`410`	`408`
`411`	`409`	`%s BASH_CASE_MODE`
`@@ -1407,52 +1405,52 @@ function/[ \t]+[a-zA-Z_][a-zA-Z_0-9]* {`
`1407`	`1405`	`}`
`1408`	`1406`
`1409`	`1407`	`":" {`
`1410`		`- thisModeStack.push(PARAMETER_EXPANSION_MODE);`
	`1408`	`+ thisModeStack.push(UNLEXED_PARAMETER_EXPANSION_MODE);`
`1411`	`1409`	`emit(EXPANSION_BEGIN, tokenText);`
`1412`	`1410`	`}`
`1413`	`1411`
`1414`	`1412`	`"@" {`
`1415`		`- thisModeStack.push(PARAMETER_EXPANSION_MODE);`
	`1413`	`+ thisModeStack.push(UNLEXED_PARAMETER_EXPANSION_MODE);`
`1416`	`1414`	`emit(EXPANSION_BEGIN, tokenText);`
`1417`	`1415`	`}`
`1418`	`1416`
`1419`	`1417`	`"%" {`
`1420`		`- thisModeStack.push(PARAMETER_EXPANSION_MODE);`
	`1418`	`+ thisModeStack.push(UNLEXED_PARAMETER_EXPANSION_MODE);`
`1421`	`1419`	`emit(EXPANSION_BEGIN, tokenText);`
`1422`	`1420`	`}`
`1423`	`1421`
`1424`	`1422`	`"-" {`
`1425`		`- thisModeStack.push(PARAMETER_EXPANSION_MODE);`
	`1423`	`+ thisModeStack.push(UNLEXED_PARAMETER_EXPANSION_MODE);`
`1426`	`1424`	`emit(EXPANSION_BEGIN, tokenText);`
`1427`	`1425`	`}`
`1428`	`1426`
`1429`	`1427`	`"+" {`
`1430`		`- thisModeStack.push(PARAMETER_EXPANSION_MODE);`
	`1428`	`+ thisModeStack.push(UNLEXED_PARAMETER_EXPANSION_MODE);`
`1431`	`1429`	`emit(EXPANSION_BEGIN, tokenText);`
`1432`	`1430`	`}`
`1433`	`1431`
`1434`	`1432`	`"=" {`
`1435`		`- thisModeStack.push(PARAMETER_EXPANSION_MODE);`
	`1433`	`+ thisModeStack.push(UNLEXED_PARAMETER_EXPANSION_MODE);`
`1436`	`1434`	`emit(EXPANSION_BEGIN, tokenText);`
`1437`	`1435`	`}`
`1438`	`1436`
`1439`	`1437`	`"?" {`
`1440`		`- thisModeStack.push(PARAMETER_EXPANSION_MODE);`
	`1438`	`+ thisModeStack.push(UNLEXED_PARAMETER_EXPANSION_MODE);`
`1441`	`1439`	`emit(EXPANSION_BEGIN, tokenText);`
`1442`	`1440`	`}`
`1443`	`1441`
`1444`	`1442`	`"\*" {`
`1445`		`- thisModeStack.push(PARAMETER_EXPANSION_MODE);`
	`1443`	`+ thisModeStack.push(UNLEXED_PARAMETER_EXPANSION_MODE);`
`1446`	`1444`	`emit(EXPANSION_BEGIN, tokenText);`
`1447`	`1445`	`}`
`1448`	`1446`
`1449`	`1447`	`"##" {`
`1450`		`- thisModeStack.push(PARAMETER_EXPANSION_MODE);`
	`1448`	`+ thisModeStack.push(UNLEXED_PARAMETER_EXPANSION_MODE);`
`1451`	`1449`	`emit(EXPANSION_BEGIN, tokenText);`
`1452`	`1450`	`}`
`1453`	`1451`
`1454`	`1452`	`"#" {`
`1455`		`- thisModeStack.push(PARAMETER_EXPANSION_MODE);`
	`1453`	`+ thisModeStack.push(UNLEXED_PARAMETER_EXPANSION_MODE);`
`1456`	`1454`	`emit(EXPANSION_BEGIN, tokenText);`
`1457`	`1455`	`}`
`1458`	`1456`
`@@ -1477,13 +1475,6 @@ function/[ \t]+[a-zA-Z_][a-zA-Z_0-9]* {`
`1477`	`1475`	`}`
`1478`	`1476`	`}`
`1479`	`1477`
`1480`		`-<PARAMETER_EXPANSION_MODE>{`
`1481`		`- "}" {`
`1482`		`- thisModeStack.pop();`
`1483`		`- reconsume_token();`
`1484`		`- }`
`1485`		`-}`
`1486`		`-`
`1487`	`1478`	`<UNLEXED_PARAMETER_EXPANSION_MODE>{`
`1488`	`1479`	`[^}]+ {`
`1489`	`1480`	`emit(PARAMETER_EXPANSION_CONTENT, tokenText);`