osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Get rid of difference between T_VAL_NUMBER_STRING and 

T_VAL_UNQUOTED string in order to fix parsing problem (single digit number
vs. multiple digit numbers). T_VAL_NUMBER_STRING no longer exists.

svn path=/trunk/; revision=877
This commit is contained in:
Gilbert Ramirez 1999-10-17 20:54:56 +00:00
parent c68b5aa64e
commit 997cff3aba
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dfilter-grammar.y
View File

@ -3,7 +3,7 @@
/* dfilter-grammar.y
* Parser for display filters
*
* $Id: dfilter-grammar.y,v 1.34 1999/10/17 14:15:06 deniel Exp $
* $Id: dfilter-grammar.y,v 1.35 1999/10/17 20:54:56 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -153,7 +153,6 @@ dfilter *global_df = NULL;
%token <string> T_VAL_UNQUOTED_STRING
%token <string> T_VAL_BYTE_STRING
%token <string> T_VAL_NUMBER_STRING
%token <byte_range> T_VAL_BYTE_RANGE
%token <operand> TOK_AND TOK_OR TOK_NOT TOK_XOR
@ -288,7 +287,7 @@ relation: numeric_variable numeric_relation numeric_value
;
numeric_value: T_VAL_NUMBER_STRING
numeric_value: T_VAL_UNQUOTED_STRING
{
$$ = dfilter_mknode_numeric_value(string_to_value($1));
g_free($1);
@ -305,7 +304,7 @@ ether_value: T_VAL_BYTE_STRING
}
;
ipxnet_value: T_VAL_NUMBER_STRING
ipxnet_value: T_VAL_UNQUOTED_STRING
{
$$ = dfilter_mknode_ipxnet_value(string_to_value($1));
g_free($1);
@ -360,7 +359,7 @@ bytes_value: T_VAL_BYTE_STRING
g_free($1);
}
| T_VAL_NUMBER_STRING
| T_VAL_UNQUOTED_STRING
{
guint32 val32 = string_to_value($1);
guint8 val8;

6
dfilter-scanner.l
View File

@ -3,7 +3,7 @@
/* dfilter-scanner.l
* Scanner for display filters
*
* $Id: dfilter-scanner.l,v 1.23 1999/10/17 01:54:19 itojun Exp $
* $Id: dfilter-scanner.l,v 1.24 1999/10/17 20:54:56 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -161,7 +161,7 @@ le|\<\= { dfilter_lval.operand = TOK_LE; return TOK_LE; }
0[xX][A-Fa-f0-9]+ { /* hex values */
dfilter_lval.string = g_strdup(yytext);
return T_VAL_NUMBER_STRING;
return T_VAL_UNQUOTED_STRING;
}
[A-Za-z0-9\:][A-Za-z0-9\.\_\-\:]+ {
@ -248,7 +248,7 @@ le|\<\= { dfilter_lval.operand = TOK_LE; return TOK_LE; }
{minus}?[0-9]+ { /* decimal or octal values */
dfilter_lval.string = g_strdup(yytext);
return T_VAL_NUMBER_STRING;
return T_VAL_UNQUOTED_STRING;
}