Diff for /parser3/src/main/compile_tools.h between versions 1.59 and 1.66

version 1.59, 2002/04/15 06:45:58 version 1.66, 2002/09/20 10:22:12
Line 3 Line 3
   
         Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)          Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
         Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)          Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
   
         $Id$  
 */  */
   
 #ifndef COMPILE_TOOLS  #ifndef COMPILE_TOOLS
 #define COMPILE_TOOLS  #define COMPILE_TOOLS
   
   static const char* IDENT_COMPILE_TOOLS_H="$Date$";
   
 #include "pa_opcode.h"  #include "pa_opcode.h"
 #include "pa_types.h"  #include "pa_types.h"
 #include "pa_vstring.h"  #include "pa_vstring.h"
Line 17 Line 17
   
 enum lexical_state {  enum lexical_state {
         LS_USER, LS_NAME_SQUARE_PART,          LS_USER, LS_NAME_SQUARE_PART,
         LS_COMMENT,          LS_USER_COMMENT,
         LS_DEF_NAME,          LS_DEF_NAME,
         LS_DEF_PARAMS,          LS_DEF_PARAMS,
         LS_DEF_LOCALS,          LS_DEF_LOCALS,
Line 26  enum lexical_state { Line 26  enum lexical_state {
         LS_EXPRESSION_STRING_QUOTED,          LS_EXPRESSION_STRING_QUOTED,
         LS_EXPRESSION_STRING_APOSTROFED,          LS_EXPRESSION_STRING_APOSTROFED,
         LS_EXPRESSION_VAR_NAME_WITH_COLON, LS_EXPRESSION_VAR_NAME_WITHOUT_COLON,          LS_EXPRESSION_VAR_NAME_WITH_COLON, LS_EXPRESSION_VAR_NAME_WITHOUT_COLON,
           LS_EXPRESSION_COMMENT,
         LS_VAR_NAME_SIMPLE_WITH_COLON, LS_VAR_NAME_SIMPLE_WITHOUT_COLON,          LS_VAR_NAME_SIMPLE_WITH_COLON, LS_VAR_NAME_SIMPLE_WITHOUT_COLON,
         LS_VAR_NAME_CURLY,          LS_VAR_NAME_CURLY,
         LS_VAR_ROUND,          LS_VAR_ROUND,
Line 44  struct parse_control { Line 45  struct parse_control {
         Pool *pool;          Pool *pool;
         Request *request;          Request *request;
         VStateless_class *cclass;          VStateless_class *cclass;
 #ifndef NO_CSTRING_ORIGIN  #ifndef NO_STRING_ORIGIN
         const char *source;          const char *source;
         const char *file;          const char *file;
 #endif  #endif
Line 90  inline void P(Array/*<Operation>*/ *resu Line 91  inline void P(Array/*<Operation>*/ *resu
 }  }
   
 /// aPpend 'vstring' to 'result'  /// aPpend 'vstring' to 'result'
 void PV(Array/*<Operation>*/ *result, VString *vstring);  void PV(Array/*<Operation>*/ *result, Value *value);
 /// Parameter 'simple Code_Array'  
 void PCA(Array/*<Operation>*/ *result, Array/*<Operation>*/ *code_array);  inline void OA(Array/*<Operation>*/ *result, OPCODE opcode, Array/*<Operation>*/ *code_array) {
 /// Parameter 'Expression code_Array'          // append OP_CODE
 void PEA(Array/*<Operation>*/ *result, Array/*<Operation>*/ *code_array);          Operation op; op.code=opcode;
 /// Construct 'simple Code_Array'          *result+=op.cast;
 void CCA(Array/*<Operation>*/ *result, Array/*<Operation>*/ *code_array);  
 /// aPpend Nested Code          // append 'vstring'
 void PNC(Array/*<Operation>*/ *result, Array/*<Operation>*/ *code_array);          *result+=code_array;
 /// aPpend obJect Pool  }
 void PJP(Array/*<Operation>*/ *result, Array/*<Operation>*/ *code_array);  
 /// aPpend String Pool  
 void PSP(Array/*<Operation>*/ *result, Array/*<Operation>*/ *code_array);  
   
 /**  /**
         Value Literal // returns array with           Value Literal // returns array with 
         - first: OP_VALUE instruction          - first: OP_VALUE instruction
         - second op: string itself          - second op: string itself
 */  */
 Array *VL(Value *value);  inline Array *VL(Value *value) {
           // empty ops array
           Array *result=N(value->pool());
   
           // append 'value' to 'result'
           PV(result, value);
   
           return result;
   }
   
 /// Literal Array to(2) Value @return Value from literal Array OP+Value  /// Literal Array to(2) Value @return Value from literal Array OP+Value
 Value *LA2V(Array *literal_string_array, int offset=0);  Value *LA2V(Array *literal_string_array, int offset=0);
 /// Literal Array to(2) String  @return String value from literal Array OP+String array  /// Literal Array to(2) String  @return String value from literal Array OP+String array
Line 118  inline const String *LA2S(Array *literal Line 125  inline const String *LA2S(Array *literal
                 return value->get_string();                  return value->get_string();
         return 0;          return 0;
 }  }
   
   inline void change_string_literal_to_write_string_literal(Array *literal_string_array) {
           Operation op; op.code=OP_STRING__WRITE;
           literal_string_array->put(0, op.cast);
   }
   
   void changetail_or_append(Array *opcodes, 
                                                     OPCODE find, bool with_argument, OPCODE replace, OPCODE notfound);
   
 void change_string_literal_to_double_literal(Array *literal_string_array);  void change_string_literal_to_double_literal(Array *literal_string_array);
 void change_string_literal_to_write_string_literal(Array *literal_string_array);  
   void change_string_literal_value(Array *literal_string_array, const String& new_value);
   
 void push_LS(parse_control& pc, lexical_state new_state);  void push_LS(parse_control& pc, lexical_state new_state);
 void pop_LS(parse_control& pc);  void pop_LS(parse_control& pc);

Removed from v.1.59  
changed lines
  Added in v.1.66


E-mail: