| OLD | NEW |
| 1 """SCons.Scanner.D | 1 """SCons.Scanner.D |
| 2 | 2 |
| 3 Scanner for the Digital Mars "D" programming language. | 3 Scanner for the Digital Mars "D" programming language. |
| 4 | 4 |
| 5 Coded by Andy Friesen | 5 Coded by Andy Friesen |
| 6 17 Nov 2003 | 6 17 Nov 2003 |
| 7 | 7 |
| 8 """ | 8 """ |
| 9 | 9 |
| 10 # | 10 # |
| 11 # Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The SCons Foundat
ion | 11 # Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 The SCons F
oundation |
| 12 # | 12 # |
| 13 # Permission is hereby granted, free of charge, to any person obtaining | 13 # Permission is hereby granted, free of charge, to any person obtaining |
| 14 # a copy of this software and associated documentation files (the | 14 # a copy of this software and associated documentation files (the |
| 15 # "Software"), to deal in the Software without restriction, including | 15 # "Software"), to deal in the Software without restriction, including |
| 16 # without limitation the rights to use, copy, modify, merge, publish, | 16 # without limitation the rights to use, copy, modify, merge, publish, |
| 17 # distribute, sublicense, and/or sell copies of the Software, and to | 17 # distribute, sublicense, and/or sell copies of the Software, and to |
| 18 # permit persons to whom the Software is furnished to do so, subject to | 18 # permit persons to whom the Software is furnished to do so, subject to |
| 19 # the following conditions: | 19 # the following conditions: |
| 20 # | 20 # |
| 21 # The above copyright notice and this permission notice shall be included | 21 # The above copyright notice and this permission notice shall be included |
| 22 # in all copies or substantial portions of the Software. | 22 # in all copies or substantial portions of the Software. |
| 23 # | 23 # |
| 24 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY | 24 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY |
| 25 # KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE | 25 # KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE |
| 26 # WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | 26 # WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
| 27 # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | 27 # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE |
| 28 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | 28 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION |
| 29 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | 29 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION |
| 30 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | 30 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
| 31 # | 31 # |
| 32 | 32 |
| 33 __revision__ = "src/engine/SCons/Scanner/D.py 3842 2008/12/20 22:59:52 scons" | 33 __revision__ = "src/engine/SCons/Scanner/D.py 3897 2009/01/13 06:45:54 scons" |
| 34 | 34 |
| 35 import re | 35 import re |
| 36 import string | 36 import string |
| 37 | 37 |
| 38 import SCons.Scanner | 38 import SCons.Scanner |
| 39 | 39 |
| 40 def DScanner(): | 40 def DScanner(): |
| 41 """Return a prototype Scanner instance for scanning D source files""" | 41 """Return a prototype Scanner instance for scanning D source files""" |
| 42 ds = D() | 42 ds = D() |
| 43 return ds | 43 return ds |
| (...skipping 12 matching lines...) Expand all Loading... |
| 56 # translate dots (package separators) to slashes | 56 # translate dots (package separators) to slashes |
| 57 inc = string.replace(include, '.', '/') | 57 inc = string.replace(include, '.', '/') |
| 58 | 58 |
| 59 i = SCons.Node.FS.find_file(inc + '.d', (source_dir,) + path) | 59 i = SCons.Node.FS.find_file(inc + '.d', (source_dir,) + path) |
| 60 if i is None: | 60 if i is None: |
| 61 i = SCons.Node.FS.find_file (inc + '.di', (source_dir,) + path) | 61 i = SCons.Node.FS.find_file (inc + '.di', (source_dir,) + path) |
| 62 return i, include | 62 return i, include |
| 63 | 63 |
| 64 def find_include_names(self, node): | 64 def find_include_names(self, node): |
| 65 includes = [] | 65 includes = [] |
| 66 for i in self.cre.findall(node.get_contents()): | 66 for i in self.cre.findall(node.get_text_contents()): |
| 67 includes = includes + self.cre2.findall(i) | 67 includes = includes + self.cre2.findall(i) |
| 68 return includes | 68 return includes |
| OLD | NEW |