diff options
| author | Thomas White <taw@physics.org> | 2019-10-03 18:17:44 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2019-10-05 17:03:43 +0200 |
| commit | 7db1f2b50c09365e6181bffbad7c043885a75e48 (patch) | |
| tree | 620542da51472fc7a9294d2daa127727e1ef9457 | |
| parent | 54b33a62d7d1dd5e70ee2d54a0bba51a59bac76f (diff) | |
Use characters instead of SQOPEN/SQCLOSE
| -rw-r--r-- | libstorycode/storycode.l | 4 | ||||
| -rw-r--r-- | libstorycode/storycode.y | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/libstorycode/storycode.l b/libstorycode/storycode.l index cadd771..2e063f8 100644 --- a/libstorycode/storycode.l +++ b/libstorycode/storycode.l @@ -102,8 +102,8 @@ BGCOL { BEGIN(col); return SC_BGCOL; } \n { BEGIN(0); lineno++; } -"[" { sqb_caller = YY_START; BEGIN(sqb); return SC_SQOPEN; } -"]" { BEGIN(sqb_caller); return SC_SQCLOSE; } +"[" { sqb_caller = YY_START; BEGIN(sqb); return '['; } +"]" { BEGIN(sqb_caller); return ']'; } [{] { return '{'; } [}] { return '}'; } [. ] {} diff --git a/libstorycode/storycode.y b/libstorycode/storycode.y index c6ba2eb..7de9fb0 100644 --- a/libstorycode/storycode.y +++ b/libstorycode/storycode.y @@ -123,7 +123,6 @@ %token VERT HORIZ %token LEFT CENTER RIGHT %token FONTNAME RUN_TEXT -%token SQOPEN SQCLOSE %token UNIT VALUE HEXCOL %token TEXT_START @@ -470,7 +469,7 @@ frame_options: { $<style>$.mask = 0; $<style>$.alignment = ALIGN_INHERIT; } /* Each option is enclosed in square brackets */ frame_option: - SQOPEN frameopt SQCLOSE { $$ = $2; } + '[' frameopt ']' { $$ = $2; } ; frameopt: |