summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2005-03-30 21:58:44 (UTC)
committer Michael Krelin <hacker@klever.net>2005-03-30 21:58:44 (UTC)
commit5c757590c7561f6d85b3f9011aa0695c4111b379 (patch) (unidiff)
treee0bf20ca58b3e7bd9cc4eda54db5674ba1d71db0
parent3ddbfeafde93d1aab16a710498d86eef4e787406 (diff)
downloadsitecing-5c757590c7561f6d85b3f9011aa0695c4111b379.zip
sitecing-5c757590c7561f6d85b3f9011aa0695c4111b379.tar.gz
sitecing-5c757590c7561f6d85b3f9011aa0695c4111b379.tar.bz2
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
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--include/sitecing/sitecing_enflesher.h9
-rw-r--r--include/sitecing/sitecing_parser.h8
-rw-r--r--lib/component_factory.cc2
-rw-r--r--lib/sitecing_enflesher.ll8
-rw-r--r--lib/sitecing_parser.ll49
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
@@ -72,8 +72,17 @@ class sitecing_enflesher : public sitecing_enflesherFlexLexer {
72 * destination filename, if needed, and open new file. 72 * destination filename, if needed, and open new file.
73 * @see outs 73 * @see outs
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};
78 87
79#endif /* __SITECING_SITECING_ENFLESHER_H */ 88#endif /* __SITECING_SITECING_ENFLESHER_H */
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
@@ -291,6 +291,14 @@ class sitecing_parser : public sitecing_parserFlexLexer {
291 * The reference to the component factory object. 291 * The reference to the component factory object.
292 */ 292 */
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
295 /** 303 /**
296 * @param f the component factory. 304 * @param f the component factory.
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
@@ -319,7 +319,7 @@ namespace sitecing {
319 make(cn); 319 make(cn);
320 ifstream ifs(cn.c_str()); 320 ifstream ifs(cn.c_str());
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();
324 while(!ifs.eof()) { 324 while(!ifs.eof()) {
325 string a; 325 string 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
@@ -179,6 +179,7 @@ void sitecing_enflesher::enflesh() {
179 throw preprocessor_error(CODEPOINT,"failed to open skeleton file"); 179 throw preprocessor_error(CODEPOINT,"failed to open skeleton file");
180 switch_streams(&ifs,NULL); 180 switch_streams(&ifs,NULL);
181 yylex(); 181 yylex();
182 outs_close();
182} 183}
183 184
184void sitecing_enflesher::anchor() { 185void sitecing_enflesher::anchor() {
@@ -188,7 +189,7 @@ void sitecing_enflesher::anchor() {
188 anchor_time = false; 189 anchor_time = false;
189} 190}
190 191
191void sitecing_enflesher::outs_open(const string& nfile) { 192void sitecing_enflesher::outs_close() {
192 if(!outs_filename.empty()) { 193 if(!outs_filename.empty()) {
193 outs.flush(); 194 outs.flush();
194 outs.close(); 195 outs.close();
@@ -244,6 +245,11 @@ void sitecing_enflesher::outs_open(const string& nfile) {
244 throw preprocessor_error(CODEPOINT,"failed to rename() generated output"); 245 throw preprocessor_error(CODEPOINT,"failed to rename() generated output");
245 } 246 }
246 } 247 }
248 outs_filename.erase();
249}
250
251void sitecing_enflesher::outs_open(const string& nfile) {
252 outs_close();
247 outs_filename = nfile; 253 outs_filename = nfile;
248 outs.open((nfile+".new").c_str(),ios::trunc); 254 outs.open((nfile+".new").c_str(),ios::trunc);
249 if(!outs.good()) 255 if(!outs.good())
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
@@ -23,6 +23,7 @@ using namespace sitecing;
23%x DERIVELINE DERIVECOMPONENT 23%x DERIVELINE DERIVECOMPONENT
24%x CONSTRUCTOR DESTRUCTOR CODEMETHODLINE CODEMETHODARGS 24%x CONSTRUCTOR DESTRUCTOR CODEMETHODLINE CODEMETHODARGS
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
27 28
28 WHITESPACE[ \t] 29 WHITESPACE[ \t]
@@ -94,6 +95,10 @@ NOIDCHAR [^A-Za-z0-9_]
94 anchor(); 95 anchor();
95 BEGIN(METHODLINE); 96 BEGIN(METHODLINE);
96 } 97 }
98 ^\%\%pragma{WHITESPACE}+{
99 modi.push_front(modus_operandi(modus_operandi::flag_devour_comments));
100 BEGIN(PRAGMALINE);
101 }
97 <<EOF>>{ 102 <<EOF>>{
98 assert(modi.size()==1); 103 assert(modi.size()==1);
99 M().modify(modus_operandi::modus_preop); 104 M().modify(modus_operandi::modus_preop);
@@ -110,6 +115,36 @@ NOIDCHAR [^A-Za-z0-9_]
110 } 115 }
111} 116}
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>{
114 {WHITESPACE}+{ 149 {WHITESPACE}+{
115 modus_operandi& m = modi.front(); 150 modus_operandi& m = modi.front();
@@ -406,7 +441,7 @@ NOIDCHAR [^A-Za-z0-9_]
406 modi.pop_front(); 441 modi.pop_front();
407 BEGIN(INITIAL); 442 BEGIN(INITIAL);
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 "/*"{
411 yy_push_state(SLASHSTAR_COMMENT); 446 yy_push_state(SLASHSTAR_COMMENT);
412 if(!M().devour_comments()) { 447 if(!M().devour_comments()) {
@@ -546,7 +581,17 @@ void sitecing_parser::preprocess(const string& in) {
546 switch_streams(&ifs,NULL); 581 switch_streams(&ifs,NULL);
547 if(yylex()) 582 if(yylex())
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)
551 member_functions.push_back(member_function("","","","")); 596 member_functions.push_back(member_function("","","",""));
552 sitecing_enflesher enflesher(*this); 597 sitecing_enflesher enflesher(*this);