diff options
| -rwxr-xr-x | interpreter.py | 12 | ||||
| -rwxr-xr-x | shellgenerator.py | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/interpreter.py b/interpreter.py index 2b12db3..66059ac 100755 --- a/interpreter.py +++ b/interpreter.py @@ -71,15 +71,15 @@ class Interpreter(): self.sanity_check_ast() self.project = None self.compilers = [] - self.executables = {} + self.targets = {} self.variables = {} self.scratch_dir = scratch_dir def get_project(self): return self.project - def get_executables(self): - return self.executables + def get_targets(self): + return self.targets def sanity_check_ast(self): if not isinstance(self.ast, nodes.CodeBlock): @@ -149,10 +149,10 @@ class Interpreter(): raise InvalidArguments('Line %d: Argument %s is not a string.' % str(a)) name = args[0] sources = args[1:] - if name in self.executables: - raise InvalidCode('Line %d, tried to create executable "%s", which already exists.' % (node.lineno(), name)) + if name in self.target: + raise InvalidCode('Line %d, tried to create executable "%s", but a build target of that name already exists.' % (node.lineno(), name)) exe = Executable(name, sources) - self.executables[name] = exe + self.targets[name] = exe print('Creating executable %s with %d files.' % (name, len(sources))) return exe diff --git a/shellgenerator.py b/shellgenerator.py index 92f1e05..69fdbb4 100755 --- a/shellgenerator.py +++ b/shellgenerator.py @@ -76,10 +76,10 @@ class ShellGenerator(): outfile.write(' '.join(quoted) + ' || exit\n') def generate_commands(self, outfile): - for i in self.interpreter.get_executables().items(): + for i in self.interpreter.get_targets().items(): name = i[0] e = i[1] - print('Generating executable', name) + print('Generating target', name) outname = os.path.join(self.environment.get_build_dir(), e.get_basename()) suffix = self.environment.get_exe_suffix() if suffix != '': |