Changeset 950:51c15f98a965 in freeDiameter for libfdcore/fdd.l

Timestamp:

Feb 21, 2013, 7:57:32 PM (11 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Parents:

949:ad5c976e0dc7 (diff), 924:877592751fee (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

merge current version from 1.1 branch (927:877592751fee).

File:

• libfdcore/fdd.l (modified) (2 diffs)

libfdcore/fdd.l

@@ -52 +52 @@
         yylloc->first_column = yylloc->last_column + 1;                 \
         yylloc->last_column = yylloc->first_column + yyleng - 1;        \
-        TRACE_DEBUG_ERROR("(%d:%d-%d:%d) matched rule %d, length=%d, txt='%s'\n",       \
+        TRACE_DEBUG_ERROR(                                              \
+                "(%d:%d-%d:%d) matched rule %d, length=%d, txt='%s'\n", \
                 yylloc->first_line, yylloc->first_column,               \
                 yylloc->last_line, yylloc->last_column,                 \
@@ -145 +146 @@
 <*>[[:alnum:]]+         |       /* This rule is only useful to print a complete token in error messages */
         /* Unrecognized character */
-<*>.                    { 
+<*>.                    {
                                 TRACE_DEBUG_ERROR("Unrecognized text on line %d col %d: '%s'.\n", yylloc->first_line, yylloc->first_column, yytext);
                                 return LEX_ERROR;