[Forensics-changes] [yara] 24/192: Re-generate lexer.c after latest changes in lexer.l
Hilko Bengen
bengen at moszumanska.debian.org
Sat Jul 1 10:31:42 UTC 2017
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to annotated tag v3.6.0
in repository yara.
commit c262003e317237aa485e10db7702f505d04eb048
Author: plusvic <plusvic at gmail.com>
Date: Thu Sep 8 19:15:32 2016 +0200
Re-generate lexer.c after latest changes in lexer.l
---
libyara/lexer.c | 202 ++++++++++++++++++++++++++++++++++----------------------
1 file changed, 123 insertions(+), 79 deletions(-)
diff --git a/libyara/lexer.c b/libyara/lexer.c
index cc67184..d29ccfa 100644
--- a/libyara/lexer.c
+++ b/libyara/lexer.c
@@ -756,6 +756,7 @@ with noyywrap then we can remove this pragma.
#include <stdio.h>
#include <string.h>
#include <setjmp.h>
+#include <unistd.h>
#include <yara/integers.h>
#include <yara/lexer.h>
@@ -809,7 +810,7 @@ with noyywrap then we can remove this pragma.
-#line 813 "lexer.c"
+#line 814 "lexer.c"
#define INITIAL 0
#define str 1
@@ -1086,10 +1087,10 @@ YY_DECL
}
{
-#line 123 "lexer.l"
+#line 124 "lexer.l"
-#line 1093 "lexer.c"
+#line 1094 "lexer.c"
while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
{
@@ -1156,208 +1157,208 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
-#line 125 "lexer.l"
+#line 126 "lexer.l"
{ return _DOT_DOT_; }
YY_BREAK
case 2:
YY_RULE_SETUP
-#line 126 "lexer.l"
+#line 127 "lexer.l"
{ return _LT_; }
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 127 "lexer.l"
+#line 128 "lexer.l"
{ return _GT_; }
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 128 "lexer.l"
+#line 129 "lexer.l"
{ return _LE_; }
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 129 "lexer.l"
+#line 130 "lexer.l"
{ return _GE_; }
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 130 "lexer.l"
+#line 131 "lexer.l"
{ return _EQ_; }
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 131 "lexer.l"
+#line 132 "lexer.l"
{ return _NEQ_; }
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 132 "lexer.l"
+#line 133 "lexer.l"
{ return _SHIFT_LEFT_; }
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 133 "lexer.l"
+#line 134 "lexer.l"
{ return _SHIFT_RIGHT_; }
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 134 "lexer.l"
+#line 135 "lexer.l"
{ return _PRIVATE_; }
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 135 "lexer.l"
+#line 136 "lexer.l"
{ return _GLOBAL_; }
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 136 "lexer.l"
+#line 137 "lexer.l"
{ return _RULE_; }
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 137 "lexer.l"
+#line 138 "lexer.l"
{ return _META_; }
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 138 "lexer.l"
+#line 139 "lexer.l"
{ return _STRINGS_; }
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 139 "lexer.l"
+#line 140 "lexer.l"
{ return _ASCII_; }
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 140 "lexer.l"
+#line 141 "lexer.l"
{ return _WIDE_; }
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 141 "lexer.l"
+#line 142 "lexer.l"
{ return _FULLWORD_; }
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 142 "lexer.l"
+#line 143 "lexer.l"
{ return _NOCASE_; }
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 143 "lexer.l"
+#line 144 "lexer.l"
{ return _CONDITION_; }
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 144 "lexer.l"
+#line 145 "lexer.l"
{ return _TRUE_; }
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 145 "lexer.l"
+#line 146 "lexer.l"
{ return _FALSE_; }
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 146 "lexer.l"
+#line 147 "lexer.l"
{ return _NOT_; }
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 147 "lexer.l"
+#line 148 "lexer.l"
{ return _AND_; }
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 148 "lexer.l"
+#line 149 "lexer.l"
{ return _OR_; }
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 149 "lexer.l"
+#line 150 "lexer.l"
{ return _AT_; }
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 150 "lexer.l"
+#line 151 "lexer.l"
{ return _IN_; }
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 151 "lexer.l"
+#line 152 "lexer.l"
{ return _OF_; }
YY_BREAK
case 28:
YY_RULE_SETUP
-#line 152 "lexer.l"
+#line 153 "lexer.l"
{ return _THEM_; }
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 153 "lexer.l"
+#line 154 "lexer.l"
{ return _FOR_; }
YY_BREAK
case 30:
YY_RULE_SETUP
-#line 154 "lexer.l"
+#line 155 "lexer.l"
{ return _ALL_; }
YY_BREAK
case 31:
YY_RULE_SETUP
-#line 155 "lexer.l"
+#line 156 "lexer.l"
{ return _ANY_; }
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 156 "lexer.l"
+#line 157 "lexer.l"
{ return _ENTRYPOINT_; }
YY_BREAK
case 33:
YY_RULE_SETUP
-#line 157 "lexer.l"
+#line 158 "lexer.l"
{ return _FILESIZE_; }
YY_BREAK
case 34:
YY_RULE_SETUP
-#line 158 "lexer.l"
+#line 159 "lexer.l"
{ return _MATCHES_; }
YY_BREAK
case 35:
YY_RULE_SETUP
-#line 159 "lexer.l"
+#line 160 "lexer.l"
{ return _CONTAINS_; }
YY_BREAK
case 36:
YY_RULE_SETUP
-#line 160 "lexer.l"
+#line 161 "lexer.l"
{ return _IMPORT_; }
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 163 "lexer.l"
+#line 164 "lexer.l"
{ BEGIN(comment); }
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 164 "lexer.l"
+#line 165 "lexer.l"
{ BEGIN(INITIAL); }
YY_BREAK
case 39:
/* rule 39 can match eol */
YY_RULE_SETUP
-#line 165 "lexer.l"
+#line 166 "lexer.l"
{ /* skip comments */ }
YY_BREAK
case 40:
YY_RULE_SETUP
-#line 168 "lexer.l"
+#line 169 "lexer.l"
{ /* skip single-line comments */ }
YY_BREAK
case 41:
YY_RULE_SETUP
-#line 171 "lexer.l"
+#line 172 "lexer.l"
{
yyextra->lex_buf_ptr = yyextra->lex_buf;
yyextra->lex_buf_len = 0;
@@ -1367,12 +1368,12 @@ YY_RULE_SETUP
case 42:
/* rule 42 can match eol */
YY_RULE_SETUP
-#line 178 "lexer.l"
+#line 179 "lexer.l"
{ YYTEXT_TO_BUFFER; }
YY_BREAK
case 43:
YY_RULE_SETUP
-#line 181 "lexer.l"
+#line 182 "lexer.l"
{
char buffer[1024];
@@ -1488,7 +1489,7 @@ case YY_STATE_EOF(str):
case YY_STATE_EOF(regexp):
case YY_STATE_EOF(include):
case YY_STATE_EOF(comment):
-#line 293 "lexer.l"
+#line 294 "lexer.l"
{
YR_COMPILER* compiler = yara_yyget_extra(yyscanner);
@@ -1510,7 +1511,7 @@ case YY_STATE_EOF(comment):
YY_BREAK
case 44:
YY_RULE_SETUP
-#line 313 "lexer.l"
+#line 314 "lexer.l"
{
yylval->c_string = yr_strdup(yytext);
@@ -1526,7 +1527,7 @@ YY_RULE_SETUP
YY_BREAK
case 45:
YY_RULE_SETUP
-#line 327 "lexer.l"
+#line 328 "lexer.l"
{
yylval->c_string = yr_strdup(yytext);
@@ -1542,7 +1543,7 @@ YY_RULE_SETUP
YY_BREAK
case 46:
YY_RULE_SETUP
-#line 341 "lexer.l"
+#line 342 "lexer.l"
{
yylval->c_string = yr_strdup(yytext);
@@ -1559,7 +1560,7 @@ YY_RULE_SETUP
YY_BREAK
case 47:
YY_RULE_SETUP
-#line 356 "lexer.l"
+#line 357 "lexer.l"
{
yylval->c_string = yr_strdup(yytext);
@@ -1576,7 +1577,7 @@ YY_RULE_SETUP
YY_BREAK
case 48:
YY_RULE_SETUP
-#line 371 "lexer.l"
+#line 372 "lexer.l"
{
yylval->c_string = yr_strdup(yytext);
@@ -1593,7 +1594,7 @@ YY_RULE_SETUP
YY_BREAK
case 49:
YY_RULE_SETUP
-#line 386 "lexer.l"
+#line 387 "lexer.l"
{
char* text = yytext;
@@ -1634,7 +1635,7 @@ YY_RULE_SETUP
YY_BREAK
case 50:
YY_RULE_SETUP
-#line 425 "lexer.l"
+#line 426 "lexer.l"
{
if (strlen(yytext) > 128)
@@ -1655,7 +1656,7 @@ YY_RULE_SETUP
YY_BREAK
case 51:
YY_RULE_SETUP
-#line 444 "lexer.l"
+#line 445 "lexer.l"
{
#ifdef _MSC_VER
@@ -1677,7 +1678,7 @@ YY_RULE_SETUP
YY_BREAK
case 52:
YY_RULE_SETUP
-#line 463 "lexer.l"
+#line 464 "lexer.l"
{
yylval->double_ = atof(yytext);
return _DOUBLE_;
@@ -1685,7 +1686,7 @@ YY_RULE_SETUP
YY_BREAK
case 53:
YY_RULE_SETUP
-#line 468 "lexer.l"
+#line 469 "lexer.l"
{
yylval->integer = xtoi(yytext + 2);
@@ -1694,7 +1695,7 @@ YY_RULE_SETUP
YY_BREAK
case 54:
YY_RULE_SETUP
-#line 475 "lexer.l"
+#line 476 "lexer.l"
{ /* saw closing quote - all done */
ALLOC_SIZED_STRING(s, yyextra->lex_buf_len);
@@ -1710,7 +1711,7 @@ YY_RULE_SETUP
YY_BREAK
case 55:
YY_RULE_SETUP
-#line 489 "lexer.l"
+#line 490 "lexer.l"
{
LEX_CHECK_SPACE_OK("\t", yyextra->lex_buf_len, LEX_BUF_SIZE);
@@ -1720,7 +1721,7 @@ YY_RULE_SETUP
YY_BREAK
case 56:
YY_RULE_SETUP
-#line 497 "lexer.l"
+#line 498 "lexer.l"
{
LEX_CHECK_SPACE_OK("\n", yyextra->lex_buf_len, LEX_BUF_SIZE);
@@ -1730,7 +1731,7 @@ YY_RULE_SETUP
YY_BREAK
case 57:
YY_RULE_SETUP
-#line 505 "lexer.l"
+#line 506 "lexer.l"
{
LEX_CHECK_SPACE_OK("\"", yyextra->lex_buf_len, LEX_BUF_SIZE);
@@ -1740,7 +1741,7 @@ YY_RULE_SETUP
YY_BREAK
case 58:
YY_RULE_SETUP
-#line 513 "lexer.l"
+#line 514 "lexer.l"
{
LEX_CHECK_SPACE_OK("\\", yyextra->lex_buf_len, LEX_BUF_SIZE);
@@ -1750,7 +1751,7 @@ YY_RULE_SETUP
YY_BREAK
case 59:
YY_RULE_SETUP
-#line 521 "lexer.l"
+#line 522 "lexer.l"
{
int result;
@@ -1763,13 +1764,13 @@ YY_RULE_SETUP
YY_BREAK
case 60:
YY_RULE_SETUP
-#line 532 "lexer.l"
+#line 533 "lexer.l"
{ YYTEXT_TO_BUFFER; }
YY_BREAK
case 61:
/* rule 61 can match eol */
YY_RULE_SETUP
-#line 535 "lexer.l"
+#line 536 "lexer.l"
{
yyerror(yyscanner, compiler, "unterminated string");
@@ -1779,7 +1780,7 @@ YY_RULE_SETUP
case 62:
/* rule 62 can match eol */
YY_RULE_SETUP
-#line 541 "lexer.l"
+#line 542 "lexer.l"
{
yyerror(yyscanner, compiler, "illegal escape sequence");
@@ -1787,7 +1788,7 @@ YY_RULE_SETUP
YY_BREAK
case 63:
YY_RULE_SETUP
-#line 547 "lexer.l"
+#line 548 "lexer.l"
{
if (yyextra->lex_buf_len > 0)
@@ -1815,7 +1816,7 @@ YY_RULE_SETUP
YY_BREAK
case 64:
YY_RULE_SETUP
-#line 573 "lexer.l"
+#line 574 "lexer.l"
{
LEX_CHECK_SPACE_OK("/", yyextra->lex_buf_len, LEX_BUF_SIZE);
@@ -1825,7 +1826,7 @@ YY_RULE_SETUP
YY_BREAK
case 65:
YY_RULE_SETUP
-#line 581 "lexer.l"
+#line 582 "lexer.l"
{
LEX_CHECK_SPACE_OK("\\.", yyextra->lex_buf_len, LEX_BUF_SIZE);
@@ -1836,13 +1837,13 @@ YY_RULE_SETUP
YY_BREAK
case 66:
YY_RULE_SETUP
-#line 590 "lexer.l"
+#line 591 "lexer.l"
{ YYTEXT_TO_BUFFER; }
YY_BREAK
case 67:
/* rule 67 can match eol */
YY_RULE_SETUP
-#line 593 "lexer.l"
+#line 594 "lexer.l"
{
yyerror(yyscanner, compiler, "unterminated regular expression");
@@ -1851,7 +1852,7 @@ YY_RULE_SETUP
YY_BREAK
case 68:
YY_RULE_SETUP
-#line 600 "lexer.l"
+#line 601 "lexer.l"
{
yyextra->lex_buf_ptr = yyextra->lex_buf;
@@ -1861,7 +1862,7 @@ YY_RULE_SETUP
YY_BREAK
case 69:
YY_RULE_SETUP
-#line 608 "lexer.l"
+#line 609 "lexer.l"
{
yyextra->lex_buf_ptr = yyextra->lex_buf;
@@ -1872,7 +1873,7 @@ YY_RULE_SETUP
case 70:
/* rule 70 can match eol */
YY_RULE_SETUP
-#line 616 "lexer.l"
+#line 617 "lexer.l"
{
// Match hex-digits with whitespace or comments. The latter are stripped
// out by hex_lexer.l
@@ -1888,12 +1889,12 @@ YY_RULE_SETUP
case 71:
/* rule 71 can match eol */
YY_RULE_SETUP
-#line 629 "lexer.l"
+#line 630 "lexer.l"
/* skip whitespace */
YY_BREAK
case 72:
YY_RULE_SETUP
-#line 631 "lexer.l"
+#line 632 "lexer.l"
{
if (yytext[0] >= 32 && yytext[0] < 127)
@@ -1909,10 +1910,10 @@ YY_RULE_SETUP
YY_BREAK
case 73:
YY_RULE_SETUP
-#line 644 "lexer.l"
+#line 645 "lexer.l"
ECHO;
YY_BREAK
-#line 1916 "lexer.c"
+#line 1917 "lexer.c"
case YY_END_OF_BUFFER:
{
@@ -3061,7 +3062,7 @@ void yara_yyfree (void * ptr , yyscan_t yyscanner)
#define YYTABLES_NAME "yytables"
-#line 644 "lexer.l"
+#line 645 "lexer.l"
@@ -3231,3 +3232,46 @@ int yr_lex_parse_rules_file(
return compiler->errors;
}
+
+int yr_lex_parse_rules_fd(
+ YR_FILE_DESCRIPTOR rules_fd,
+ YR_COMPILER* compiler)
+{
+ yyscan_t yyscanner;
+
+ compiler->errors = 0;
+
+ if (setjmp(compiler->error_recovery) != 0)
+ return compiler->errors;
+
+ yara_yylex_init(&yyscanner);
+
+ #if YYDEBUG
+ yydebug = 1;
+ #endif
+
+ char buf[1024];
+ int len;
+
+ yara_yyset_extra(compiler,yyscanner);
+ while (1)
+ {
+ len = read(rules_fd, buf, sizeof(buf));
+ if (len < 0)
+ {
+ if (errno == EINTR)
+ continue;
+ else
+ break;
+ }
+ if (len == 0)
+ break;
+ yara_yy_scan_bytes(buf,len,yyscanner);
+ }
+
+ yyparse(yyscanner, compiler);
+ yara_yylex_destroy(yyscanner);
+
+ return compiler->errors;
+}
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git
More information about the forensics-changes
mailing list