Diff for /parser3/src/main/compile.C between versions 1.25 and 1.38

version 1.25, 2001/03/11 08:16:34 version 1.38, 2001/05/28 06:10:06
Line 1 Line 1
 /*  /** @file
         Parser          Parser: compiler part of request class.
   
         Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)          Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
   
         Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)          Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
   
         $Id$          $Id$
 */  */
   
   #include "pa_opcode.h"
 #include "pa_request.h"  #include "pa_request.h"
 #include "pa_string.h"  #include "pa_string.h"
 #include "pa_array.h"  #include "pa_array.h"
 #include "code.h"  
 #include "compile_tools.h"  #include "compile_tools.h"
 #include "pa_exception.h"  #include "pa_exception.h"
   
Line 18 Line 20
 extern int yydebug;  extern int yydebug;
 extern int yyparse (void *);  extern int yyparse (void *);
   
 VClass& Request::real_compile(COMPILE_PARAMS) {  VStateless_class& Request::real_compile(COMPILE_PARAMS) {
         // prepare to parse          // prepare to parse
         struct parse_control pc;          struct parse_control pc;
   
         // input           // input 
         pc.pool=&pool();          pc.pool=&pool();
         pc.request=this;          pc.request=this;
         VClass *vclass;          VStateless_class *cclass;
         if(name) { // we were told the name of compiled class?          if(aclass) // we were told the class to compile to?
                   cclass=aclass; // yes, remember it [used in ^process]
           else if(name) { // we were told the name of compiled class?
                 // yes. create it                  // yes. create it
                 vclass=NEW VClass(pool());                  cclass=NEW VClass(pool());
                 // defaulting base. may change with @BASE                  // defaulting base. may change with @BASE
                 vclass->set_base(base_class?*base_class:root_class);                  // dont use ?: for there would be getting & of temp object
                 // append to request's classes                  if(base_class)
                 classes_array()+=vclass;                          cclass->set_base(*base_class);
                 classes().put(*name, vclass);                  classes().put(*name, cclass);
                 vclass->set_name(*name);                  cclass->set_name(*name);
         } else          } else
                 vclass=&root_class; // until changed with @CLASS would consider operators loading                  cclass=&OP; // until changed with @CLASS would consider operators loading
         pc.vclass=vclass;          pc.cclass=cclass;
   
         pc.source=source;          pc.source=source;
 #ifndef NO_STRING_ORIGIN  #ifndef NO_STRING_ORIGIN
Line 51  VClass& Request::real_compile(COMPILE_PA Line 55  VClass& Request::real_compile(COMPILE_PA
         pc.sp=0;          pc.sp=0;
                   
         // parse=compile!           // parse=compile! 
         yydebug=1;  //      yydebug=1;
         if(yyparse(&pc)) { // error?          if(yyparse(&pc)) { // error?
                 if(pc.col==0) { // expecting something after EOL means they've expected it BEFORE                  if(pc.col==0) { // expecting something after EOL means they've expected it BEFORE
                         // step back.  -1 col means EOL                          // step back.  -1 col means EOL
Line 64  VClass& Request::real_compile(COMPILE_PA Line 68  VClass& Request::real_compile(COMPILE_PA
         }          }
   
         // result          // result
         return *pc.vclass;          return *pc.cclass;
 }  }

Removed from v.1.25  
changed lines
  Added in v.1.38


E-mail: