#include <msp/strings/regex.h>
#include "programparser.h"
+#undef interface
+
using namespace std;
namespace Msp {
{
if(*iter=='/')
comment = 0;
- else
+ else if(*iter!='*')
comment = 3;
}
bool ProgramParser::is_sampling_qualifier(const string &token)
{
- return token=="centroid";
+ return (token=="centroid" || token=="sample");
+}
+
+bool ProgramParser::is_interpolation_qualifier(const string &token)
+{
+ return (token=="smooth" || token=="flat" || token=="noperspective");
}
bool ProgramParser::is_precision_qualifier(const string &token)
bool ProgramParser::is_qualifier(const string &token)
{
- return (token=="const" || is_interface_qualifier(token) || is_sampling_qualifier(token) || is_precision_qualifier(token));
+ return (token=="const" ||
+ is_interface_qualifier(token) ||
+ is_sampling_qualifier(token) ||
+ is_interpolation_qualifier(token) ||
+ is_precision_qualifier(token));
}
bool ProgramParser::is_builtin_type(const string &token)
else if(is_interface_qualifier(token))
{
string next = peek_token(1);
- if(is_type(next) || is_precision_qualifier(next))
+ if(is_type(next) || is_qualifier(next))
return parse_variable_declaration();
else
return parse_interface_block();
if(token=="if")
return parse_conditional();
else if(token=="for")
- return parse_iteration();
+ return parse_for();
+ else if(token=="while")
+ return parse_while();
else if(token=="passthrough")
return parse_passthrough();
else if(token=="return")
RefPtr<VariableDeclaration> var = new VariableDeclaration;
string token = peek_token();
- if(is_sampling_qualifier(token))
- {
- var->sampling = parse_token();
- token = peek_token();
- if(!is_interface_qualifier(token))
- throw runtime_error(format_syntax_error("an interface qualifier"));
- }
-
- if(is_interface_qualifier(token))
- var->interface = parse_token();
- else if(token=="const")
+ while(is_qualifier(token))
{
- var->constant = true;
parse_token();
+ if(is_interface_qualifier(token))
+ var->interface = token;
+ else if(is_sampling_qualifier(token))
+ var->sampling = token;
+ else if(is_interpolation_qualifier(token))
+ var->interpolation = token;
+ else if(is_precision_qualifier(token))
+ var->precision = token;
+ else if(token=="const")
+ var->constant = true;
+ token = peek_token();
}
- if(is_precision_qualifier(token))
- var->precision = parse_token();
-
var->type = expect_type();
var->name = expect_identifier();
return cond;
}
-RefPtr<Iteration> ProgramParser::parse_iteration()
+RefPtr<Iteration> ProgramParser::parse_for()
{
expect("for");
expect("(");
loop->init_statement = parse_statement();
else
{
- RefPtr<ExpressionStatement> expr = new ExpressionStatement;
- expr->expression = parse_expression();
+ if(token!=";")
+ {
+ RefPtr<ExpressionStatement> expr = new ExpressionStatement;
+ expr->expression = parse_expression();
+ loop->init_statement = expr;
+ }
expect(";");
- loop->init_statement = expr;
}
- loop->condition = parse_expression();
+ if(peek_token()!=";")
+ loop->condition = parse_expression();
expect(";");
- loop->loop_expression = parse_expression();
+ if(peek_token()!=")")
+ loop->loop_expression = parse_expression();
+ expect(")");
+
+ parse_block(loop->body, false);
+
+ return loop;
+}
+
+RefPtr<Iteration> ProgramParser::parse_while()
+{
+ expect("while");
+ expect("(");
+ RefPtr<Iteration> loop = new Iteration;
+ loop->condition = parse_expression();
expect(")");
parse_block(loop->body, false);