-rw-r--r-- | include/sitecing/sitecing_enflesher.h | 9 | ||||
-rw-r--r-- | include/sitecing/sitecing_parser.h | 8 | ||||
-rw-r--r-- | lib/component_factory.cc | 2 | ||||
-rw-r--r-- | lib/sitecing_enflesher.ll | 8 | ||||
-rw-r--r-- | lib/sitecing_parser.ll | 49 |
5 files changed, 72 insertions, 4 deletions
diff --git a/include/sitecing/sitecing_enflesher.h b/include/sitecing/sitecing_enflesher.h index 8bc43a0..db15bc3 100644 --- a/include/sitecing/sitecing_enflesher.h +++ b/include/sitecing/sitecing_enflesher.h | |||
@@ -74,4 +74,13 @@ class sitecing_enflesher : public sitecing_enflesherFlexLexer { | |||
74 | * @see outs_filename | 74 | * @see outs_filename |
75 | * @see outs_close | ||
75 | */ | 76 | */ |
76 | void outs_open(const string& nfile); | 77 | void outs_open(const string& nfile); |
78 | /** | ||
79 | * Close previously opened output stream, and rename to the 'correct' | ||
80 | * destination filename, if needed. | ||
81 | * @see outs_open | ||
82 | * @see outs | ||
83 | * @see outs_filename | ||
84 | */ | ||
85 | void outs_close(); | ||
77 | }; | 86 | }; |
diff --git a/include/sitecing/sitecing_parser.h b/include/sitecing/sitecing_parser.h index 22d716f..a8474f3 100644 --- a/include/sitecing/sitecing_parser.h +++ b/include/sitecing/sitecing_parser.h | |||
@@ -293,2 +293,10 @@ class sitecing_parser : public sitecing_parserFlexLexer { | |||
293 | component_factory& factory; | 293 | component_factory& factory; |
294 | /** | ||
295 | * Pragma map type. | ||
296 | */ | ||
297 | typedef map<string,string> pragmas_t; | ||
298 | /** | ||
299 | * Pragma's found in the component. | ||
300 | */ | ||
301 | pragmas_t pragmas; | ||
294 | 302 | ||
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 | |||
@@ -321,3 +321,3 @@ namespace sitecing { | |||
321 | if(!ifs.good()) | 321 | if(!ifs.good()) |
322 | throw konforka::exception(CODEPOINT,"filed to access component .ancestors"); | 322 | throw konforka::exception(CODEPOINT,string("failed to access component '")+component+"' .ancestors"); |
323 | rv.clear(); | 323 | rv.clear(); |
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 | |||
@@ -181,2 +181,3 @@ void sitecing_enflesher::enflesh() { | |||
181 | yylex(); | 181 | yylex(); |
182 | outs_close(); | ||
182 | } | 183 | } |
@@ -190,3 +191,3 @@ void sitecing_enflesher::anchor() { | |||
190 | 191 | ||
191 | void sitecing_enflesher::outs_open(const string& nfile) { | 192 | void sitecing_enflesher::outs_close() { |
192 | if(!outs_filename.empty()) { | 193 | if(!outs_filename.empty()) { |
@@ -246,2 +247,7 @@ void sitecing_enflesher::outs_open(const string& nfile) { | |||
246 | } | 247 | } |
248 | outs_filename.erase(); | ||
249 | } | ||
250 | |||
251 | void sitecing_enflesher::outs_open(const string& nfile) { | ||
252 | outs_close(); | ||
247 | outs_filename = nfile; | 253 | outs_filename = nfile; |
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 | |||
@@ -25,2 +25,3 @@ using namespace sitecing; | |||
25 | %x CODEMETHODBLOCK INLINE METHODLINE METHODARGS METHODBLOCK CODEBLOCK OUTPUTBLOCK | 25 | %x CODEMETHODBLOCK INLINE METHODLINE METHODARGS METHODBLOCK CODEBLOCK OUTPUTBLOCK |
26 | %x PRAGMALINE | ||
26 | %option 8bit c++ verbose noyywrap yyclass="sitecing_parser" prefix="sitecing_parser" stack yylineno | 27 | %option 8bit c++ verbose noyywrap yyclass="sitecing_parser" prefix="sitecing_parser" stack yylineno |
@@ -96,2 +97,6 @@ NOIDCHAR [^A-Za-z0-9_] | |||
96 | } | 97 | } |
98 | ^\%\%pragma{WHITESPACE}+{ | ||
99 | modi.push_front(modus_operandi(modus_operandi::flag_devour_comments)); | ||
100 | BEGIN(PRAGMALINE); | ||
101 | } | ||
97 | <<EOF>>{ | 102 | <<EOF>>{ |
@@ -112,2 +117,32 @@ NOIDCHAR [^A-Za-z0-9_] | |||
112 | 117 | ||
118 | <PRAGMALINE>{ | ||
119 | {WHITESPACE}+{ | ||
120 | modus_operandi& m = M(); | ||
121 | if(!m.output.empty()) { | ||
122 | string::size_type eq = m.output.find('='); | ||
123 | if(eq==string::npos) { | ||
124 | pragmas[m.output]=m.output; | ||
125 | }else{ | ||
126 | pragmas[m.output.substr(0,eq)] = m.output.substr(eq+1); | ||
127 | } | ||
128 | m.output.erase(); | ||
129 | } | ||
130 | } | ||
131 | \n { | ||
132 | modus_operandi& m = M(); | ||
133 | if(!m.output.empty()) { | ||
134 | string::size_type eq = m.output.find('='); | ||
135 | if(eq==string::npos) { | ||
136 | pragmas[m.output]=m.output; | ||
137 | }else{ | ||
138 | pragmas[m.output.substr(0,eq)] = m.output.substr(eq+1); | ||
139 | } | ||
140 | m.output.erase(); | ||
141 | } | ||
142 | modi.pop_front(); | ||
143 | BEGIN(INITIAL); | ||
144 | anchor(); | ||
145 | } | ||
146 | } | ||
147 | |||
113 | <METHODLINE>{ | 148 | <METHODLINE>{ |
@@ -408,3 +443,3 @@ NOIDCHAR [^A-Za-z0-9_] | |||
408 | } | 443 | } |
409 | <CLASSLINE,DECLLINE,IMPLLINE,VARLINE,VARINIT,IMPORTLINE,IMPORTCOMPONENT,CODEMETHODLINE,CODEMETHODARGS,INLINE,METHODLINE,METHODARGS,DECLBLOCK,IMPLBLOCK,CONSTRUCTOR,DESTRUCTOR,CODEMETHODBLOCK,CODELINE,CODEBLOCK>{ | 444 | <CLASSLINE,DECLLINE,IMPLLINE,VARLINE,VARINIT,IMPORTLINE,IMPORTCOMPONENT,CODEMETHODLINE,CODEMETHODARGS,INLINE,METHODLINE,METHODARGS,DECLBLOCK,IMPLBLOCK,CONSTRUCTOR,DESTRUCTOR,CODEMETHODBLOCK,CODELINE,CODEBLOCK,PRAGMALINE>{ |
410 | "/*"{ | 445 | "/*"{ |
@@ -548,3 +583,13 @@ void sitecing_parser::preprocess(const string& in) { | |||
548 | throw preprocessor_error(CODEPOINT,"unknown error"); | 583 | throw preprocessor_error(CODEPOINT,"unknown error"); |
549 | member_functions.push_back(member_function("void","main","(int _magic,va_list _args)",M().output)); | 584 | pragmas_t::const_iterator mp = pragmas.find("main"); |
585 | if(mp==pragmas.end()) { | ||
586 | member_functions.push_back(member_function("void","main","(int _magic,va_list _args)",M().output)); | ||
587 | }else{ | ||
588 | member_functions.push_back( | ||
589 | member_function( | ||
590 | "void","main","(int _magic,va_list _args)", | ||
591 | mp->second+"::main(_magic,_args);" | ||
592 | ) | ||
593 | ); | ||
594 | } | ||
550 | if(have_initializers && !have_constructor) | 595 | if(have_initializers && !have_constructor) |