Issue #783 - Allow dollar sign anywhere in ID or value, quoting is allowed, not required (#786)

rakillen · web-flow · commit f04471cd3b00 · 2020-11-18T10:28:57.000-06:00
diff --git a/core/src/main/antlr4/oracle/weblogic/deploy/yaml/Yaml.g4 b/core/src/main/antlr4/oracle/weblogic/deploy/yaml/Yaml.g4
@@ -288,6 +288,7 @@ fragment ID_START
     | [a-z]
     | [0-9]
     | '!'
+    | '$'
     ;
 
 fragment ID_CONTINUE
@@ -299,7 +300,6 @@ fragment ID_CONTINUE
 // to support variables in IDs that will need to be quoted because of the curly braces
 fragment QUOTED_ID_START
     : ID_START
-    | '$'
     | '@'
     ;
 

Original file line number	Diff line number	Diff line change
`@@ -288,6 +288,7 @@ fragment ID_START`
`288`	`288`	`\| [a-z]`
`289`	`289`	`\| [0-9]`
`290`	`290`	`\| '!'`
	`291`	`+ \| '$'`
`291`	`292`	`;`
`292`	`293`
`293`	`294`	`fragment ID_CONTINUE`
`@@ -299,7 +300,6 @@ fragment ID_CONTINUE`
`299`	`300`	`// to support variables in IDs that will need to be quoted because of the curly braces`
`300`	`301`	`fragment QUOTED_ID_START`
`301`	`302`	`: ID_START`
`302`		`- \| '$'`
`303`	`303`	`\| '@'`
`304`	`304`	`;`
`305`	`305`