1. fixed a bug just introduced, preventing the last skeleton-generated file

   from being written.
2. introduced pragma directive and pragma main=class
3. minor changes of no importance

3 files changed, 55 insertions, 4 deletions

diff --git a/lib/component_factory.cc b/lib/component_factory.cc
index b8f5a16..1253111 100644
--- a/lib/component_factory.cc
+++ b/lib/component_factory.cc
@@ -298,35 +298,35 @@ namespace sitecing {
         }
         // parent
         close(stdo); close(stde);
         int rv;
         if(waitpid(pid,&rv,0)<0)
             throw konforka::exception(CODEPOINT,"failed to waitpid()");
         return rv;
     }
 
     string component_factory::get_classname(const string& component) {
         string cn = root_intermediate+normalize_path(component,strip_trailing_slash|strip_leading_slash)+".classname";
         make(cn);
         ifstream ifs(cn.c_str());
         if(!ifs.good())
             throw konforka::exception(CODEPOINT,"failed to access component .classname");
         ifs >> cn;
         return cn;
     }
 
     void component_factory::get_ancestors(const string& component,file_list_t& rv) {
         string cn = root_intermediate+normalize_path(component,strip_trailing_slash|strip_leading_slash)+".ancestors";
         make(cn);
         ifstream ifs(cn.c_str());
         if(!ifs.good())
-            throw konforka::exception(CODEPOINT,"filed to access component .ancestors");
+            throw konforka::exception(CODEPOINT,string("failed to access component '")+component+"' .ancestors");
         rv.clear();
         while(!ifs.eof()) {
             string a;
             ifs >> a;
             if(!a.empty())
                 rv.push_back(a);
         }
     }
 
 }
diff --git a/lib/sitecing_enflesher.ll b/lib/sitecing_enflesher.ll
index 46489c7..bb667be 100644
--- a/lib/sitecing_enflesher.ll
+++ b/lib/sitecing_enflesher.ll
@@ -158,58 +158,59 @@ ID	[A-Za-z_][A-Za-z0-9_]*
         outs << i->name << "::__do_imports();\n";
     }
     anchor_time = true;
 }
 
         \n                      {
     if(anchor_time)
         anchor();
     ECHO;
 }
         .                       ECHO;
 
 %%
 
 void sitecing_enflesher::LexerOutput(const char *buf,int size) {
     outs.write(buf,size);
 }
 
 void sitecing_enflesher::enflesh() {
     ifstream ifs(parser.skeleton.c_str());
     if(!ifs.good())
         throw preprocessor_error(CODEPOINT,"failed to open skeleton file");
     switch_streams(&ifs,NULL);
     yylex();
+    outs_close();
 }
 
 void sitecing_enflesher::anchor() {
     if(!anchoraged)
         return;
     outs << "\n#line " << lineno() << " \"" << parser.skeleton << "\"\n";
     anchor_time = false;
 }
 
-void sitecing_enflesher::outs_open(const string& nfile) {
+void sitecing_enflesher::outs_close() {
     if(!outs_filename.empty()) {
         outs.flush();
         outs.close();
         outs.clear();
         /*
          * compare source and destination files.
          *
          * one can also keep a hash for the old one and compute one for the
          * output while writing, but I'm not sure if it's any better. Surely a
          * bit less accurate, unless we're going to compare it in case of
          * difference, anyway.
          */
         bool overwrite = false;
         struct stat st_s, st_d;
         string fn_s = outs_filename+".new";
         string fn_d = outs_filename;
         if(stat(fn_d.c_str(),&st_d)) {
             overwrite = true;
         }else{
             if(stat(fn_s.c_str(),&st_s))
                 throw preprocessor_error(CODEPOINT,"failed to stat() supposedly created file");
             if(st_s.st_size!=st_d.st_size) {
                 overwrite = true;
             }else{
@@ -223,32 +224,37 @@ void sitecing_enflesher::outs_open(const string& nfile) {
                 char t1[2048];
                 char t2[sizeof(t1)];
                 while(remaining) {
                     int rb = remaining;
                     if(rb>sizeof(t1))
                         rb = sizeof(t1);
                     if(i_s.read(t1,rb).gcount()!=rb)
                         throw preprocessor_error(CODEPOINT,"error reading just created file");
                     if(i_d.read(t2,rb).gcount()!=rb)
                         throw preprocessor_error(CODEPOINT,"error reading the old preprocessed source");
                     if(memcmp(t1,t2,rb)) {
                         overwrite = true;
                         break;
                     }
                     remaining -= rb;
                 }
             }
         }
         if(overwrite) {
             cerr << "renaming '" << fn_s << "'" << endl;
             if(rename(fn_s.c_str(),fn_d.c_str()))
                 throw preprocessor_error(CODEPOINT,"failed to rename() generated output");
         }
     }
+    outs_filename.erase();
+}
+
+void sitecing_enflesher::outs_open(const string& nfile) {
+    outs_close();
     outs_filename = nfile;
     outs.open((nfile+".new").c_str(),ios::trunc);
     if(!outs.good())
         throw preprocessor_error(CODEPOINT,"failed to write preprocessor output");
 }
 /*
  * vim:set ft=lex:
  */
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
@@ -2,48 +2,49 @@
  /*
   * XXX: I have a strong feeling that this parser should be completely rewritten.
   */
 #include <iostream>
 #include <fstream>
 #include <cassert>
 #include <stdexcept>
 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));
         anchor();
         BEGIN(DECLLINE);
     }
             ^\%\%impl{WHITESPACE}+{
         modi.push_front(modus_operandi(0));
         anchor();
         BEGIN(IMPLLINE);
     }
@@ -73,64 +74,98 @@ NOIDCHAR	[^A-Za-z0-9_]
             ^\%\%derive{WHITESPACE}+{
         modi.push_front(modus_operandi(modus_operandi::flag_devour_comments));
         BEGIN(DERIVELINE);
     }
             \<\%constructor\>{
         modi.push_front(modus_operandi());
         anchor();
         BEGIN(CONSTRUCTOR);
     }
             \<\%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()) {
                         if(!m._type.empty()) m._type += ' ';
                         m._type += m._lastid;
                     }
                     m._lastid = m.output;
                     m.output.clear();
                 }
             \({
         modus_operandi& m = modi.front();
@@ -385,49 +420,49 @@ NOIDCHAR	[^A-Za-z0-9_]
         member_variables.push_back(member_variable(m._type,m._name,m.output));
         if(!m.output.empty())
             have_initializers=true;
         modi.pop_front();
         BEGIN(INITIAL);
     }
 }
         <DECLLINE>\n{
     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;
     }
             \'\\.\'{
         ECHO;
     }
 }
 
 <INITIAL,METHODBLOCK,OUTPUTBLOCK>{
             \"soft_anchor(); M().modify(modus_operandi::modus_text); LexerOutput("\\\"",2);
             \nsoft_anchor(); M().modify(modus_operandi::modus_text); LexerOutput("\\n",2);
@@ -525,49 +560,59 @@ NOIDCHAR	[^A-Za-z0-9_]
         {WHITESPACE}+{
     if(!(M().flags&modus_operandi::flag_devour_whitespace)) {
         ECHO;
     }
 }
 
 %%
 
 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:
  { "",    "(*(__SCIF->out))", "(*(__SCIF->out))<<", "(*(__SCIF->out))<<\"" }, // code
  { ";",   "",                 "<<",                 "<<\""                 }, // preop
  { NULL,  NULL,               "",                   "\""                   }, // postop
  { "\";", "\"",               "\"<<",               ""                     }  // text
 };
 
 void sitecing_parser::modus_operandi::modify(modus_t m) {
     const char * x = modus_transitions[modus][m];