module = new Module();
ProgramParser parser;
imported_names.insert(src_name);
- append_module(parser.parse(source, src_name));
+ append_module(parser.parse(source, src_name, 1));
process();
}
module = new Module();
ProgramParser parser;
imported_names.insert(src_name);
- append_module(parser.parse(io, src_name));
+ append_module(parser.parse(io, src_name, 1));
process();
}
if(!io)
throw runtime_error(format("module %s not found", name));
ProgramParser import_parser;
- append_module(import_parser.parse(*io, fn));
+ append_module(import_parser.parse(*io, fn, imported_names.size()));
}
void ProgramCompiler::generate(Stage &stage)
ProgramCompiler::Formatter::Formatter():
+ source_line(1),
indent(0),
parameter_list(false)
{ }
void ProgramCompiler::Formatter::append(const string &text)
{
formatted += text;
+ for(string::const_iterator i=text.begin(); i!=text.end(); ++i)
+ if(*i=='\n')
+ ++source_line;
}
void ProgramCompiler::Formatter::append(char c)
{
formatted += c;
+ if(c=='\n')
+ ++source_line;
+}
+
+void ProgramCompiler::Formatter::set_source(unsigned index, unsigned line)
+{
+ if(index!=source_index || (index && line!=source_line))
+ {
+ if(index==source_index && line==source_line+1)
+ formatted += '\n';
+ else
+ {
+ unsigned l = line;
+ if(stage->required_version<Version(3, 30))
+ --l;
+ formatted += format("#line %d %d\n", l, index);
+ }
+ }
+ source_index = index;
+ source_line = line;
}
void ProgramCompiler::Formatter::visit(Literal &literal)
{
if(i!=block.body.begin())
append('\n');
+ set_source((*i)->source, (*i)->line);
append(spaces);
(*i)->visit(*this);
}
Conditional *else_cond = dynamic_cast<Conditional *>(cond.else_body.body.front().get());
if(cond.else_body.body.size()==1 && else_cond)
{
- append(format("\n%selse ", string(indent*2, ' ')));
+ append('\n');
+ set_source(else_cond->source, else_cond->line);
+ append(format("%selse ", string(indent*2, ' ')));
else_cond->visit(*this);
}
else