Author: rpaulo
Date: Tue Jun 10 06:16:34 2014
New Revision: 267318
URL: http://svnweb.freebsd.org/changeset/base/267318

Log:
  dtc: ignore lines starting with #.
  
  This is necessary because we use the C pre-processor to parse #include lines
  and cpp adds line markings that start with #.

Modified:
  head/usr.bin/dtc/input_buffer.cc

Modified: head/usr.bin/dtc/input_buffer.cc
==============================================================================
--- head/usr.bin/dtc/input_buffer.cc    Tue Jun 10 06:04:25 2014        
(r267317)
+++ head/usr.bin/dtc/input_buffer.cc    Tue Jun 10 06:16:34 2014        
(r267318)
@@ -151,7 +151,7 @@ input_buffer::next_token()
                start = cursor;
                skip_spaces();
                // Parse /* comments
-               if (((*this)[0] == '/') && ((*this)[1] == '*'))
+               if ((*this)[0] == '/' && (*this)[1] == '*')
                {
                        // eat the start of the comment
                        ++(*this);
@@ -168,13 +168,14 @@ input_buffer::next_token()
                        // Eat the /
                        ++(*this);
                }
-               // Parse // comments
-               if (((*this)[0] == '/') && ((*this)[1] == '/'))
+               // Parse // comments and # comments
+               if (((*this)[0] == '/' && (*this)[1] == '/') || 
+                    (*this)[0] == '#')
                {
                        // eat the start of the comment
                        ++(*this);
                        ++(*this);
-                       // Find the ending * of */
+                       // Find the ending of the line
                        while (**this != '\n')
                        {
                                ++(*this);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to