1 files changed, 62 insertions, 3 deletions

diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
index e866ea5166ac..254d5af88956 100644
--- a/scripts/dtc/dtc-lexer.l
+++ b/scripts/dtc/dtc-lexer.l
@@ -29,6 +29,7 @@ PROPNODECHAR	[a-zA-Z0-9,._+*#?@-]
 PATHCHAR        ({PROPNODECHAR}|[/])
 LABEL           [a-zA-Z_][a-zA-Z0-9_]*
 STRING          \"([^\\"]|\\.)*\"
+CHAR_LITERAL    '([^']|\\')*'
 WS              [[:space:]]
 COMMENT         "/*"([^*]|\*+[^*/])*\*+"/"
 LINECOMMENT     "//".*\n
@@ -70,6 +71,27 @@ static int pop_input_file(void);
                         push_input_file(name);
                 }
 
+<*>^"#"(line)?{WS}+[0-9]+{WS}+{STRING}({WS}+[0-9]+)? {
+                        char *line, *tmp, *fn;
+                        /* skip text before line # */
+                        line = yytext;
+                        while (!isdigit(*line))
+                                line++;
+                        /* skip digits in line # */
+                        tmp = line;
+                        while (!isspace(*tmp))
+                                tmp++;
+                        /* "NULL"-terminate line # */
+                        *tmp = '\0';
+                        /* start of filename */
+                        fn = strchr(tmp + 1, '"') + 1;
+                        /* strip trailing " from filename */
+                        tmp = strchr(fn, '"');
+                        *tmp = 0;
+                        /* -1 since #line is the number of the next line */
+                        srcpos_set_line(xstrdup(fn), atoi(line) - 1);
+                }
+
 <*><<EOF>>              {
                         if (!pop_input_file()) {
                                 yyterminate();
@@ -96,6 +118,26 @@ static int pop_input_file(void);
                         return DT_MEMRESERVE;
                 }
 
+<*>"/bits/"     {
+                        DPRINT("Keyword: /bits/\n");
+                        BEGIN_DEFAULT();
+                        return DT_BITS;
+                }
+
+<*>"/delete-property/"  {
+                        DPRINT("Keyword: /delete-property/\n");
+                        DPRINT("<PROPNODENAME>\n");
+                        BEGIN(PROPNODENAME);
+                        return DT_DEL_PROP;
+                }
+
+<*>"/delete-node/"      {
+                        DPRINT("Keyword: /delete-node/\n");
+                        DPRINT("<PROPNODENAME>\n");
+                        BEGIN(PROPNODENAME);
+                        return DT_DEL_NODE;
+                }
+
 <*>{LABEL}:     {
                         DPRINT("Label: %s\n", yytext);
                         yylval.labelref = xstrdup(yytext);
@@ -103,12 +145,19 @@ static int pop_input_file(void);
                         return DT_LABEL;
                 }
 
-<V1>[0-9]+|0[xX][0-9a-fA-F]+      {
+<V1>([0-9]+|0[xX][0-9a-fA-F]+)(U|L|UL|LL|ULL)? {
                         yylval.literal = xstrdup(yytext);
                         DPRINT("Literal: '%s'\n", yylval.literal);
                         return DT_LITERAL;
                 }
 
+<*>{CHAR_LITERAL}       {
+                        yytext[yyleng-1] = '\0';
+                        yylval.literal = xstrdup(yytext+1);
+                        DPRINT("Character literal: %s\n", yylval.literal);
+                        return DT_CHAR_LITERAL;
+                }
+
 <*>\&{LABEL}    {       /* label reference */
                         DPRINT("Ref: %s\n", yytext+1);
                         yylval.labelref = xstrdup(yytext+1);
@@ -134,9 +183,10 @@ static int pop_input_file(void);
                         return ']';
                 }
 
-<PROPNODENAME>{PROPNODECHAR}+ {
+<PROPNODENAME>\\?{PROPNODECHAR}+ {
                         DPRINT("PropNodeName: %s\n", yytext);
-                        yylval.propnodename = xstrdup(yytext);
+                        yylval.propnodename = xstrdup((yytext[0] == '\\') ?
+                                                        yytext + 1 : yytext);
                         BEGIN_DEFAULT();
                         return DT_PROPNODENAME;
                 }
@@ -150,6 +200,15 @@ static int pop_input_file(void);
 <*>{COMMENT}+   /* eat C-style comments */
 <*>{LINECOMMENT}+ /* eat C++-style comments */
 
+<*>"<<"         { return DT_LSHIFT; };
+<*>">>"         { return DT_RSHIFT; };
+<*>"<="         { return DT_LE; };
+<*>">="         { return DT_GE; };
+<*>"=="         { return DT_EQ; };
+<*>"!="         { return DT_NE; };
+<*>"&&"         { return DT_AND; };
+<*>"||"         { return DT_OR; };
+
 <*>.            {
                         DPRINT("Char: %c (\\x%02x)\n", yytext[0],
                                 (unsigned)yytext[0]);