diff options
| author | June McEnroe <june@causal.agency> | 2021-01-13 16:42:30 -0500 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2021-01-13 16:42:30 -0500 |
| commit | b10e81ef8fbc7e644dd72c2ee94b9e09eeac62f8 (patch) | |
| tree | 1b9d9471153d49dc500cd9b7f1e6d50cfb505ec0 /bin/make.l | |
| parent | Move text "lexer" to hilex.c (diff) | |
| download | src-b10e81ef8fbc7e644dd72c2ee94b9e09eeac62f8.tar.gz src-b10e81ef8fbc7e644dd72c2ee94b9e09eeac62f8.zip | |
Shorten hilex class names
Diffstat (limited to 'bin/make.l')
| -rw-r--r-- | bin/make.l | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/bin/make.l b/bin/make.l index e7f3def5..d8c7071f 100644 --- a/bin/make.l +++ b/bin/make.l @@ -22,7 +22,7 @@ %} %s Assign -%x Interp Shell +%x Variable Shell ident [._[:alnum:]]+ assign [+?:!]?= @@ -55,7 +55,7 @@ operator [:!]|:: } ^{ident}/[[:blank:]]*{assign} { - return Identifier; + return Ident; } {assign} { @@ -73,24 +73,24 @@ operator [:!]|:: ^"-"?include { return Macro; } -{target} { return Identifier; } +{target} { return Ident; } "#"([^\\\n]|"\\"[^\n]|"\\\n")* { return Comment; } <*>{ "$"("{"|"(") { depth++; - BEGIN(Interp); - return Interpolation; + BEGIN(Variable); + return Subst; } - "$". { return Interpolation; } + "$". { return Subst; } } -<Interp>{ +<Variable>{ "}"|")" { if (!--depth) BEGIN(pop); - return Interpolation; + return Subst; } - [^${}()]+ { return Interpolation; } + [^${}()]+ { return Subst; } } .|\n { return Normal; } |