Merge pull request #89 from dnicolodi/set-lineno

Fix yyset_lineno() Flex compatibility wrappers
Genivia · Sep 20, 2020 · 9877c59 · 9877c59
2 parents 1159506 + 817c6e4
commit 9877c59
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/include/reflex/abslexer.h b/include/reflex/abslexer.h
@@ -323,6 +323,11 @@ class AbstractLexer {
   {
     return matcher().lineno();
   }
+  /// Set or change the starting line number of the last match.
+  inline void lineno(size_t n)
+  {
+    matcher().lineno(n);
+  }
   /// Returns the number of lines that the match spans.
   inline size_t lines() const
     /// @returns number of lines

diff --git a/include/reflex/flexlexer.h b/include/reflex/flexlexer.h
@@ -365,7 +365,7 @@ int yywrap(void);
 #define yyget_lineno(s)         static_cast<int>(static_cast<FlexLexer*>(s)->lineno())
 
 /// Flex-compatible macro: set the lineno accessor of a reentrant scanner.
-#define yyset_lineno(n,s)       static_cast<int>(static_cast<FlexLexer*>(s)->lineno(n))
+#define yyset_lineno(n,s)       static_cast<FlexLexer*>(s)->lineno(n)
 
 /// Flex-compatible macro: the reflex::Input in accessor of a reentrant scanner.
 #define yyget_in(s)             static_cast<FlexLexer*>(s)->in()

diff --git a/src/reflex.cpp b/src/reflex.cpp
@@ -1888,6 +1888,7 @@ void Reflex::write()
           "YY_EXTERN_C char *" << prefix << "get_text(yyscan_t);\n"
           "YY_EXTERN_C yy_size_t " << prefix << "get_leng(yyscan_t);\n"
           "YY_EXTERN_C int " << prefix << "get_lineno(yyscan_t);\n"
+          "YY_EXTERN_C void " << prefix << "set_lineno(int, yyscan_t);\n"
           "YY_EXTERN_C FILE *" << prefix << "get_in(yyscan_t);\n"
           "YY_EXTERN_C void " << prefix << "set_in(FILE*, yyscan_t);\n"
           "YY_EXTERN_C int " << prefix << "get_debug(yyscan_t);\n"
@@ -2626,6 +2627,12 @@ void Reflex::write_lexer()
         "  return static_cast<yyscanner_t*>(scanner)->lineno();\n"
         "}\n"
         "\n"
+        "#undef " << prefix << "set_lineno\n"
+        "YY_EXTERN_C void " << prefix << "set_lineno(int n, yyscan_t scanner)\n"
+        "{\n"
+        "  static_cast<yyscanner_t*>(scanner)->lineno(n);\n"
+        "}\n"
+        "\n"
         "#undef " << prefix << "get_in\n"
         "YY_EXTERN_C FILE *" << prefix << "get_in(yyscan_t scanner)\n"
         "{\n"