Intial Thumb2 Sandbox (naclrev 6680)

src/trusted/validator_arm/dgen_input.py

 #!/usr/bin/python
 #
-# Copyright 2009 The Native Client Authors.  All rights reserved.
+# Copyright 2011 The Native Client Authors.  All rights reserved.
 # Use of this source code is governed by a BSD-style license that can
 # be found in the LICENSE file.
-# Copyright 2009, Google Inc.
+# Copyright 2011, Google Inc.
 #
 
 """
 A simple recursive-descent parser for the table file format.
 
 The grammar implemented here is roughly (taking some liberties with whitespace
 and comment parsing):
 
 table_file ::= ( BLANK_LINE | table_def ) end_of_file ;
 table_def ::= "--" IDENT CITATION NL
@@ skipping 94 matching lines @@
 def end_of_file():
     return _line is None
 
 
 def next_line():
     global _line_no, _line
 
     _line_no += 1
     _line = _in.readline()
     if _line:
+        old_line = _line.strip()
         _line = re.sub(r'#.*', '', _line).strip()
+        if (old_line != _line) and (len(_line) == 0): # If we ate it all
+           next_line() # Get another one to allow line comments.
     else:
         _line = None
 
 
 def unexpected():
     raise Exception('Line %d: Unexpected line in input: %s' % (_line_no, _line))