Rebuild parser

Author: skef

CMakeLists.txt

@@ -34,7 +34,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 add_compile_definitions(ANTLR4CPP_STATIC)
 set(ANTLR4_WITH_STATIC_CRT OFF)
 # 4.9.3 is the latest ANTLR4 version
-set(ANTLR4_TAG tags/4.13.2)
+set(ANTLR4_TAG tags/4.13.1)
 include(ExternalAntlr4Cpp)
 
 # libxml2 configuration

c/addfeatures/hotconv/BuildGrammar.py

@@ -6,8 +6,8 @@
 import sys
 import os
 
-antlr_program = "antlr4"
-antlr_version = "4.13.2"
+antlr_program = "antlr"
+antlr_version = "4.13.1"
 
 antlr_args = ['-no-listener', '-Dlanguage=Cpp']
 

c/addfeatures/hotconv/FeatLexer.cpp

@@ -1,5 +1,5 @@
 
-// Generated from FeatLexer.g4 by ANTLR 4.13.2
+// Generated from FeatLexer.g4 by ANTLR 4.13.1
 
 #pragma once
 
@@ -23,30 +23,36 @@ class  FeatLexer : public antlr4::Lexer {
     POSITION = 38, POSITION_v = 39, PARAMETERS = 40, FEATURE_NAMES = 41, 
     CV_PARAMETERS = 42, CV_UI_LABEL = 43, CV_TOOLTIP = 44, CV_SAMPLE_TEXT = 45, 
     CV_PARAM_LABEL = 46, CV_CHARACTER = 47, SIZEMENUNAME = 48, CONTOURPOINT = 49, 
-    ANCHOR = 50, ANCHOR_DEF = 51, VALUE_RECORD_DEF = 52, MARK = 53, MARK_CLASS = 54, 
-    CURSIVE = 55, MARKBASE = 56, MARKLIG = 57, MARKLIG_v = 58, LIG_COMPONENT = 59, 
-    KNULL = 60, BASE = 61, HA_BTL = 62, VA_BTL = 63, HA_BSL = 64, VA_BSL = 65, 
-    GDEF = 66, GLYPH_CLASS_DEF = 67, ATTACH = 68, LIG_CARET_BY_POS = 69, 
-    LIG_CARET_BY_IDX = 70, HEAD = 71, FONT_REVISION = 72, HHEA = 73, ASCENDER = 74, 
-    DESCENDER = 75, LINE_GAP = 76, CARET_OFFSET = 77, NAME = 78, NAMEID = 79, 
-    OS_2 = 80, FS_TYPE = 81, FS_TYPE_v = 82, OS2_LOWER_OP_SIZE = 83, OS2_UPPER_OP_SIZE = 84, 
-    PANOSE = 85, TYPO_ASCENDER = 86, TYPO_DESCENDER = 87, TYPO_LINE_GAP = 88, 
-    WIN_ASCENT = 89, WIN_DESCENT = 90, X_HEIGHT = 91, CAP_HEIGHT = 92, WEIGHT_CLASS = 93, 
-    WIDTH_CLASS = 94, VENDOR = 95, UNICODE_RANGE = 96, CODE_PAGE_RANGE = 97, 
-    FAMILY_CLASS = 98, STAT = 99, ELIDED_FALLBACK_NAME = 100, ELIDED_FALLBACK_NAME_ID = 101, 
-    DESIGN_AXIS = 102, AXIS_VALUE = 103, FLAG = 104, LOCATION = 105, AXIS_EAVN = 106, 
-    AXIS_OSFA = 107, VHEA = 108, VERT_TYPO_ASCENDER = 109, VERT_TYPO_DESCENDER = 110, 
-    VERT_TYPO_LINE_GAP = 111, VMTX = 112, VERT_ORIGIN_Y = 113, VERT_ADVANCE_Y = 114, 
-    LCBRACE = 115, RCBRACE = 116, LBRACKET = 117, RBRACKET = 118, HYPHEN = 119, 
-    SEMI = 120, EQUALS = 121, MARKER = 122, COMMA = 123, QUOTE = 124, GCLASS = 125, 
-    CID = 126, ESCGNAME = 127, NAMELABEL = 128, EXTNAME = 129, POINTNUM = 130, 
-    NUMEXT = 131, NUMOCT = 132, NUM = 133, CATCHTAG = 134, A_WHITESPACE = 135, 
-    A_LABEL = 136, A_LBRACE = 137, A_CLOSE = 138, A_LINE = 139, I_WHITESPACE = 140, 
-    I_RPAREN = 141, IFILE = 142, I_LPAREN = 143, STRVAL = 144, EQUOTE = 145
+    ANCHOR = 50, ANCHOR_DEF = 51, VALUE_RECORD_DEF = 52, LOCATION_DEF = 53, 
+    MARK = 54, MARK_CLASS = 55, CURSIVE = 56, MARKBASE = 57, MARKLIG = 58, 
+    MARKLIG_v = 59, LIG_COMPONENT = 60, KNULL = 61, BASE = 62, HA_BTL = 63, 
+    VA_BTL = 64, HA_BSL = 65, VA_BSL = 66, GDEF = 67, GLYPH_CLASS_DEF = 68, 
+    ATTACH = 69, LIG_CARET_BY_POS = 70, LIG_CARET_BY_IDX = 71, HEAD = 72, 
+    FONT_REVISION = 73, HHEA = 74, ASCENDER = 75, DESCENDER = 76, LINE_GAP = 77, 
+    CARET_OFFSET = 78, CARET_SLOPE_RISE = 79, CARET_SLOPE_RUN = 80, NAME = 81, 
+    NAMEID = 82, OS_2 = 83, FS_TYPE = 84, FS_TYPE_v = 85, OS2_LOWER_OP_SIZE = 86, 
+    OS2_UPPER_OP_SIZE = 87, PANOSE = 88, TYPO_ASCENDER = 89, TYPO_DESCENDER = 90, 
+    TYPO_LINE_GAP = 91, WIN_ASCENT = 92, WIN_DESCENT = 93, X_HEIGHT = 94, 
+    CAP_HEIGHT = 95, SUBSCRIPT_X_SIZE = 96, SUBSCRIPT_X_OFFSET = 97, SUBSCRIPT_Y_SIZE = 98, 
+    SUBSCRIPT_Y_OFFSET = 99, SUPERSCRIPT_X_SIZE = 100, SUPERSCRIPT_X_OFFSET = 101, 
+    SUPERSCRIPT_Y_SIZE = 102, SUPERSCRIPT_Y_OFFSET = 103, STRIKEOUT_SIZE = 104, 
+    STRIKEOUT_POSITION = 105, WEIGHT_CLASS = 106, WIDTH_CLASS = 107, VENDOR = 108, 
+    UNICODE_RANGE = 109, CODE_PAGE_RANGE = 110, FAMILY_CLASS = 111, STAT = 112, 
+    ELIDED_FALLBACK_NAME = 113, ELIDED_FALLBACK_NAME_ID = 114, DESIGN_AXIS = 115, 
+    AXIS_VALUE = 116, FLAG = 117, LOCATION = 118, AXIS_EAVN = 119, AXIS_OSFA = 120, 
+    VHEA = 121, VERT_TYPO_ASCENDER = 122, VERT_TYPO_DESCENDER = 123, VERT_TYPO_LINE_GAP = 124, 
+    VMTX = 125, VERT_ORIGIN_Y = 126, VERT_ADVANCE_Y = 127, LCBRACE = 128, 
+    RCBRACE = 129, LBRACKET = 130, RBRACKET = 131, LPAREN = 132, RPAREN = 133, 
+    HYPHEN = 134, PLUS = 135, SEMI = 136, EQUALS = 137, MARKER = 138, COMMA = 139, 
+    COLON = 140, STRVAL = 141, LNAME = 142, GCLASS = 143, AXISUNIT = 144, 
+    CID = 145, ESCGNAME = 146, NAMELABEL = 147, EXTNAME = 148, POINTNUM = 149, 
+    NUMEXT = 150, NUMOCT = 151, NUM = 152, A_WHITESPACE = 153, A_LABEL = 154, 
+    A_LBRACE = 155, A_CLOSE = 156, A_LINE = 157, I_WHITESPACE = 158, I_RPAREN = 159, 
+    IFILE = 160, I_LPAREN = 161
   };
 
   enum {
-    Anon = 1, AnonContent = 2, Include = 3, Ifile = 4, String = 5
+    Anon = 1, AnonContent = 2, Include = 3, Ifile = 4
   };
 
   explicit FeatLexer(antlr4::CharStream *input);