From owner-svn-src-head@FreeBSD.ORG  Tue Jun 10 06:16:35 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2E059E06;
 Tue, 10 Jun 2014 06:16:35 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1C2162D7E;
 Tue, 10 Jun 2014 06:16:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5A6GYN7093248;
 Tue, 10 Jun 2014 06:16:34 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5A6GY4Q093247;
 Tue, 10 Jun 2014 06:16:34 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <201406100616.s5A6GY4Q093247@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Tue, 10 Jun 2014 06:16:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r267318 - head/usr.bin/dtc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Jun 2014 06:16:35 -0000

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);