1 files changed, 47 insertions, 2 deletions

diff --git a/lib/sitecing_parser.ll b/lib/sitecing_parser.ll
index 6cb78f3..8ba8673 100644
--- a/lib/sitecing_parser.ll
+++ b/lib/sitecing_parser.ll
@@ -10,32 +10,33 @@ using namespace std;
 #include "sitecing/sitecing_util.h"
 #include "sitecing/sitecing_exception.h"
 using namespace sitecing;
 #define sitecing_parser_flexlexer_once
 #include "sitecing/sitecing_parser.h"
 #include "sitecing/sitecing_enflesher.h"
 #undef yyFlexLexer
 #define yyFlexLexer sitecing_parserFlexLexer
 %}
 %x SLASHSTAR_COMMENT SLASHSLASH_COMMENT STRING
 %x CODELINE CLASSLINE DECLLINE IMPLLINE DECLBLOCK IMPLBLOCK VARLINE VARINIT
 %x IMPORTLINE IMPORTCOMPONENT
 %x IMPORTTYPELINE IMPORTTYPECOMPONENT
 %x DERIVELINE DERIVECOMPONENT
 %x CONSTRUCTOR DESTRUCTOR CODEMETHODLINE CODEMETHODARGS
 %x CODEMETHODBLOCK INLINE METHODLINE METHODARGS METHODBLOCK CODEBLOCK OUTPUTBLOCK
+%x PRAGMALINE
 %option 8bit c++ verbose noyywrap yyclass="sitecing_parser" prefix="sitecing_parser" stack yylineno
 
         WHITESPACE[ \t]
         ID      [A-Za-z_][A-Za-z0-9_]*
         NOIDCHAR[^A-Za-z0-9_]
 
 %%
 
 <INITIAL>{
             ^\%\%class{WHITESPACE}+{
         // TODO: signal error if we already have class name acquired from source.
         modi.push_front(modus_operandi(modus_operandi::flag_devour_comments|modus_operandi::flag_devour_whitespace));
         BEGIN(CLASSLINE);
     }
             ^\%\%decl{WHITESPACE}+{
         modi.push_front(modus_operandi(0));
@@ -81,48 +82,82 @@ NOIDCHAR	[^A-Za-z0-9_]
     }
             \<\%destructor\>{
         modi.push_front(modus_operandi());
         anchor();
         BEGIN(DESTRUCTOR);
     }
             \<\%codemethod{WHITESPACE}+{
         modi.push_front(modus_operandi(modus_operandi::flag_devour_comments));
         anchor();
         BEGIN(CODEMETHODLINE);
     }
     \<\%method{WHITESPACE}+ {
         modi.push_front(modus_operandi(modus_operandi::flag_devour_comments));
         anchor();
         BEGIN(METHODLINE);
     }
+            ^\%\%pragma{WHITESPACE}+{
+        modi.push_front(modus_operandi(modus_operandi::flag_devour_comments));
+        BEGIN(PRAGMALINE);
+    }
             <<EOF>>{
         assert(modi.size()==1);
         M().modify(modus_operandi::modus_preop);
         LexerOutput(";",1);
         return 0;
     }
 }
         <<EOF>>throw preprocessor_error(CODEPOINT,"unexpected end of file",lineno());
 
 <CODEBLOCK,CODEMETHODBLOCK>{
             "<%output>"{
         anchor();
         yy_push_state(OUTPUTBLOCK);
     }
 }
 
+<PRAGMALINE>{
+            {WHITESPACE}+{
+        modus_operandi& m = M();
+        if(!m.output.empty()) {
+            string::size_type eq = m.output.find('=');
+            if(eq==string::npos) {
+                pragmas[m.output]=m.output;
+            }else{
+                pragmas[m.output.substr(0,eq)] = m.output.substr(eq+1);
+            }
+            m.output.erase();
+        }
+    }
+            \n          {
+        modus_operandi& m = M();
+        if(!m.output.empty()) {
+            string::size_type eq = m.output.find('=');
+            if(eq==string::npos) {
+                pragmas[m.output]=m.output;
+            }else{
+                pragmas[m.output.substr(0,eq)] = m.output.substr(eq+1);
+            }
+            m.output.erase();
+        }
+        modi.pop_front();
+        BEGIN(INITIAL);
+        anchor();
+    }
+}
+
 <METHODLINE>{
             {WHITESPACE}+{
                             modus_operandi& m = modi.front();
                             if(!m.output.empty()) {
                                 if(!m._lastid.empty()) {
                                     if(!m._type.empty()) m._type += ' ';
                                     m._type += m._lastid;
                                 }
                                 m._lastid = m.output;
                                 m.output.clear();
                             }
                         }
             \*{
                     modus_operandi& m = modi.front();
                     ECHO;
                     if(!m._lastid.empty()) {
@@ -393,33 +428,33 @@ NOIDCHAR	[^A-Za-z0-9_]
     ECHO;
     decl += modi.front().output;
     modi.pop_front();
     BEGIN(INITIAL);
 }
         <IMPLLINE>\n{
     ECHO;
     impl += modi.front().output;
     modi.pop_front();
     BEGIN(INITIAL);
 }
         <CLASSLINE>\n{
     class_name = modi.front().output;
     modi.pop_front();
     BEGIN(INITIAL);
 }
-<CLASSLINE,DECLLINE,IMPLLINE,VARLINE,VARINIT,IMPORTLINE,IMPORTCOMPONENT,CODEMETHODLINE,CODEMETHODARGS,INLINE,METHODLINE,METHODARGS,DECLBLOCK,IMPLBLOCK,CONSTRUCTOR,DESTRUCTOR,CODEMETHODBLOCK,CODELINE,CODEBLOCK>{
+<CLASSLINE,DECLLINE,IMPLLINE,VARLINE,VARINIT,IMPORTLINE,IMPORTCOMPONENT,CODEMETHODLINE,CODEMETHODARGS,INLINE,METHODLINE,METHODARGS,DECLBLOCK,IMPLBLOCK,CONSTRUCTOR,DESTRUCTOR,CODEMETHODBLOCK,CODELINE,CODEBLOCK,PRAGMALINE>{
             "/*"{
         yy_push_state(SLASHSTAR_COMMENT);
         if(!M().devour_comments()) {
             ECHO;
         }
     }
             "//"{
         yy_push_state(SLASHSLASH_COMMENT);
         if(!M().devour_comments()) {
             ECHO;
         }
     }
             \"  {
         yy_push_state(STRING);
             ECHO;
     }
@@ -533,33 +568,43 @@ NOIDCHAR	[^A-Za-z0-9_]
 sitecing_parser::sitecing_parser(component_factory& f)
     : factory(f), have_initializers(false), have_constructor(false),
     base_class("sitecing::cgi_component"),
     base_header("sitecing/cgi_component.h"),
     skeleton(__SC_DEFAULT_SKELETON) {
     }
 
 void sitecing_parser::preprocess(const string& in) {
     ifstream ifs(in.c_str(),ios::in);
     if(!ifs.good())
         throw preprocessor_error(CODEPOINT,"failed to open input file");
     input_file = in;
     modi.push_front(modus_operandi(0));
     switch_streams(&ifs,NULL);
     if(yylex())
         throw preprocessor_error(CODEPOINT,"unknown error");
-    member_functions.push_back(member_function("void","main","(int _magic,va_list _args)",M().output));
+    pragmas_t::const_iterator mp = pragmas.find("main");
+    if(mp==pragmas.end()) {
+        member_functions.push_back(member_function("void","main","(int _magic,va_list _args)",M().output));
+    }else{
+        member_functions.push_back(
+            member_function(
+                "void","main","(int _magic,va_list _args)",
+                mp->second+"::main(_magic,_args);"
+            )
+        );
+    }
     if(have_initializers && !have_constructor)
         member_functions.push_back(member_function("","","",""));
     sitecing_enflesher enflesher(*this);
     enflesher.enflesh();
 }
 
 void sitecing_parser::LexerOutput(const char* buf,int size) {
     assert(modi.size());
     M().output.append(buf,size);
 }
 
 static const char *modus_transitions
     [sitecing_parser::modus_operandi::modi]
     [sitecing_parser::modus_operandi::modi] = {
 // To:
 // code   preop               postop                text                         From: