Skip to content

Add the script-syntax tags that had no token at all #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ghedwards merged 2 commits into from
Aug 13, 2026
Merged

Add the script-syntax tags that had no token at all #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8b30f0
Add the script-syntax tags that had no token at all
claude Aug 13, 2026
cedcb4a
Keep the tag-name whitelist out of functionModifier
claude Aug 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions cfml.parsing/src/main/antlr4/cfml/CFSCRIPTLexer.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,52 @@ CFUPDATE: [cC][fF] UPDATE -> type(UPDATE);
CFWDDX: [cC][fF] WDDX -> type(WDDX);
CFZIP: [cC][fF] ZIP -> type(ZIP);

// Tags that exist only in their cf-prefixed spelling here. The bare names -- dump, trace,
// map, xml, flush -- are ordinary function and variable names in real code (dump( ) alone
// appears in four fixtures), so minting bare tokens for them would reclassify working code.
// The cf-prefixed form carries no such risk, and each is listed in identifier as well.
CFCALENDAR: [cC][fF][cC][aA][lL][eE][nN][dD][aA][rR];
CFCHART: [cC][fF][cC][hH][aA][rR][tT];
CFCHARTDATA: [cC][fF][cC][hH][aA][rR][tT][dD][aA][tT][aA];
CFCHARTSERIES: [cC][fF][cC][hH][aA][rR][tT][sS][eE][rR][iI][eE][sS];
CFCLIENT: [cC][fF][cC][lL][iI][eE][nN][tT];
CFCLIENTSETTINGS: [cC][fF][cC][lL][iI][eE][nN][tT][sS][eE][tT][tT][iI][nN][gG][sS];
CFDOCUMENT: [cC][fF][dD][oO][cC][uU][mM][eE][nN][tT];
CFDOCUMENTITEM: [cC][fF][dD][oO][cC][uU][mM][eE][nN][tT][iI][tT][eE][mM];
CFDOCUMENTSECTION: [cC][fF][dD][oO][cC][uU][mM][eE][nN][tT][sS][eE][cC][tT][iI][oO][nN];
CFDUMP: [cC][fF][dD][uU][mM][pP];
CFFILEUPLOAD: [cC][fF][fF][iI][lL][eE][uU][pP][lL][oO][aA][dD];
CFFLUSH: [cC][fF][fF][lL][uU][sS][hH];
CFFORMGROUP: [cC][fF][fF][oO][rR][mM][gG][rR][oO][uU][pP];
CFFORMITEM: [cC][fF][fF][oO][rR][mM][iI][tT][eE][mM];
CFHTMLTOPDF: [cC][fF][hH][tT][mM][lL][tT][oO][pP][dD][fF];
CFHTMLTOPDFITEM: [cC][fF][hH][tT][mM][lL][tT][oO][pP][dD][fF][iI][tT][eE][mM];
CFINVOKE: [cC][fF][iI][nN][vV][oO][kK][eE];
CFINVOKEARGUMENT: [cC][fF][iI][nN][vV][oO][kK][eE][aA][rR][gG][uU][mM][eE][nN][tT];
CFLOGIN: [cC][fF][lL][oO][gG][iI][nN];
CFLOGINUSER: [cC][fF][lL][oO][gG][iI][nN][uU][sS][eE][rR];
CFLOGOUT: [cC][fF][lL][oO][gG][oO][uU][tT];
CFMAILPART: [cC][fF][mM][aA][iI][lL][pP][aA][rR][tT];
CFMAP: [cC][fF][mM][aA][pP];
CFMAPITEM: [cC][fF][mM][aA][pP][iI][tT][eE][mM];
CFMEDIAPLAYER: [cC][fF][mM][eE][dD][iI][aA][pP][lL][aA][yY][eE][rR];
CFMESSAGEBOX: [cC][fF][mM][eE][sS][sS][aA][gG][eE][bB][oO][xX];
CFNTAUTHENTICATE: [cC][fF][nN][tT][aA][uU][tT][hH][eE][nN][tT][iI][cC][aA][tT][eE];
CFOAUTH: [cC][fF][oO][aA][uU][tT][hH];
CFOBJECTCACHE: [cC][fF][oO][bB][jJ][eE][cC][tT][cC][aA][cC][hH][eE];
CFPROGRESSBAR: [cC][fF][pP][rR][oO][gG][rR][eE][sS][sS][bB][aA][rR];
CFREPORTPARAM: [cC][fF][rR][eE][pP][oO][rR][tT][pP][aA][rR][aA][mM];
CFSHAREPOINT: [cC][fF][sS][hH][aA][rR][eE][pP][oO][iI][nN][tT];
CFSPREADSHEET: [cC][fF][sS][pP][rR][eE][aA][dD][sS][hH][eE][eE][tT];
CFTEXTAREA: [cC][fF][tT][eE][xX][tT][aA][rR][eE][aA];
CFTIMER: [cC][fF][tT][iI][mM][eE][rR];
CFTRACE: [cC][fF][tT][rR][aA][cC][eE];
CFWEBSOCKET: [cC][fF][wW][eE][bB][sS][oO][cC][kK][eE][tT];
CFXML: [cC][fF][xX][mM][lL];
// imap is the one bare spelling the corpora actually use, so it gets both.
IMAP: [iI][mM][aA][pP];
CFIMAP: [cC][fF] IMAP -> type(IMAP);

CFCUSTOM_IDENTIFIER: [cC][fF]'_' IDENTIFIER+;

IDENTIFIER
Expand Down
39 changes: 39 additions & 0 deletions cfml.parsing/src/main/antlr4/cfml/CFSCRIPTParser.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,45 @@ cfmlFunction
| UPDATE
| WDDX
| ZIP
| CFCALENDAR
| CFCHART
| CFCHARTDATA
| CFCHARTSERIES
| CFCLIENT
| CFCLIENTSETTINGS
| CFDOCUMENT
| CFDOCUMENTITEM
| CFDOCUMENTSECTION
| CFDUMP
| CFFILEUPLOAD
| CFFLUSH
| CFFORMGROUP
| CFFORMITEM
| CFHTMLTOPDF
| CFHTMLTOPDFITEM
| CFINVOKE
| CFINVOKEARGUMENT
| CFLOGIN
| CFLOGINUSER
| CFLOGOUT
| CFMAILPART
| CFMAP
| CFMAPITEM
| CFMEDIAPLAYER
| CFMESSAGEBOX
| CFNTAUTHENTICATE
| CFOAUTH
| CFOBJECTCACHE
| CFPROGRESSBAR
| CFREPORTPARAM
| CFSHAREPOINT
| CFSPREADSHEET
| CFTEXTAREA
| CFTIMER
| CFTRACE
| CFWEBSOCKET
| CFXML
| IMAP
| CFCUSTOM_IDENTIFIER
;

Expand Down
17 changes: 17 additions & 0 deletions cfml.parsing/src/test/resources/cfml/tests/tagscript/tag_whitelist_47.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Tags that had no token at all. imap is the one bare spelling the corpora use.
imap action="close" connection="testImap";
cfimap action="open" server="mail.example.com";
cfspreadsheet action="read" src="report.xls" query="data";
cfdocument format="pdf" {
echo("body");
}
// The bare names stay ordinary identifiers -- these are functions and variables in
// real code, and minting bare tokens for them would have reclassified all of it.
dump(results);
trace = 1;
map = {};
xml = "<a/>";
flush = false;
// ... and the cf-prefixed spellings are still usable as names too.
cfdump = 1;
imapSettings = imap;
Loading
Loading