X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.cpp;h=35977cb42be534077bca6c9f3427fbbcc158d443;hb=ff8a0248f1a3c0c1f48f670867bc9106c898c55b;hp=0579bb017267c08dfab0af9f177a8077e048244d;hpb=73bef37da97b6da0b99227f63235cb52c4e56c44;p=libs%2Fgl.git

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index 0579bb01..35977cb4 100644
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -1,8 +1,6 @@
 #include <msp/core/algorithm.h>
 #include <msp/gl/extensions/ext_gpu_shader4.h>
 #include <msp/strings/format.h>
-#include <msp/strings/regex.h>
-#include <msp/strings/utils.h>
 #include "compatibility.h"
 #include "compiler.h"
 #include "error.h"
@@ -34,6 +32,7 @@ void Compiler::clear()
 	delete module;
 	module = new Module();
 	imported_names.clear();
+	module->source_map.set_name(0, "<generated>");
 }
 
 void Compiler::set_source(const string &source, const string &src_name)
@@ -104,48 +103,18 @@ void Compiler::add_shaders(Program &program)
 	}
 	catch(const compile_error &e)
 	{
-		static const Regex r_message("^(([0-9]+)\\(([0-9]+)\\) :|ERROR: ([0-9]+):([0-9]+):) (.*)$");
-		vector<string> lines = split(e.what(), '\n');
-		string translated;
-		for(vector<string>::const_iterator i=lines.begin(); i!=lines.end(); ++i)
-		{
-			RegMatch m = r_message.match(*i);
-			if(m)
-			{
-				unsigned index = 0;
-				unsigned line = 0;
-				if(m[2])
-				{
-					index = lexical_cast<unsigned>(m[2].str);
-					line = lexical_cast<unsigned>(m[3].str);
-				}
-				else if(m[4])
-				{
-					index = lexical_cast<unsigned>(m[4].str);
-					line = lexical_cast<unsigned>(m[5].str);
-				}
-				const char *src = "<unknown>";
-				if(index==0)
-					src = "<generated>";
-				else if(index-1<imported_names.size())
-					src = imported_names[index-1].c_str();
-				translated += format("%s:%d: %s", src, line, m[6].str);
-			}
-			else
-				translated += *i;
-			translated += '\n';
-		}
-
-		throw compile_error(translated);
+		throw compile_error(module->source_map.translate_errors(e.what()));
 	}
 }
 
 void Compiler::append_module(Module &mod, DataFile::Collection *res)
 {
+	module->source_map.merge_from(mod.source_map);
+
 	vector<Import *> imports = NodeGatherer<Import>().apply(mod.shared);
 	for(vector<Import *>::iterator i=imports.begin(); i!=imports.end(); ++i)
 		import(res, (*i)->module);
-	NodeRemover(set<Node *>(imports.begin(), imports.end())).apply(mod.shared);
+	NodeRemover().apply(mod.shared, set<Node *>(imports.begin(), imports.end()));
 
 	append_stage(mod.shared);
 	for(list<Stage>::iterator i=mod.stages.begin(); i!=mod.stages.end(); ++i)
@@ -192,7 +161,7 @@ void Compiler::import(DataFile::Collection *resources, const string &name)
 	if(!io)
 		throw runtime_error(format("module %s not found", name));
 	Parser import_parser;
-	append_module(import_parser.parse(*io, fn, imported_names.size()), resources);
+	append_module(import_parser.parse(*io, fn, module->source_map.get_count()), resources);
 }
 
 void Compiler::generate(Stage &stage)
@@ -215,15 +184,12 @@ bool Compiler::optimize(Stage &stage)
 {
 	ConstantConditionEliminator().apply(stage);
 
-	set<FunctionDeclaration *> inlineable = InlineableFunctionLocator().apply(stage);
-	FunctionInliner(inlineable).apply(stage);
+	FunctionInliner().apply(stage);
 
-	set<Node *> unused = UnusedVariableLocator().apply(stage);
-	set<Node *> unused2 = UnusedFunctionLocator().apply(stage);
-	unused.insert(unused2.begin(), unused2.end());
-	NodeRemover(unused).apply(stage);
+	bool result = UnusedVariableRemover().apply(stage);
+	result |= UnusedFunctionRemover().apply(stage);
 
-	return !unused.empty();
+	return result;
 }
 
 void Compiler::finalize(Stage &stage)