| -rw-r--r-- | lib/sitecing_enflesher.ll | 8 |
1 files changed, 7 insertions, 1 deletions
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: */ |