From 7db1f2b50c09365e6181bffbad7c043885a75e48 Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Thu, 3 Oct 2019 18:17:44 +0200
Subject: Use characters instead of SQOPEN/SQCLOSE

---
 libstorycode/storycode.l | 4 ++--
 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:
-- 
cgit v1.2.3