applied_patches/0319-vba-attribute.diff

   1 Index: basic/source/comp/dim.cxx
   2 ===================================================================
   3 RCS file: /cvs/script/basic/source/comp/dim.cxx,v
   4 retrieving revision 1.10.32.3
   5 diff -u -p -u -r1.10.32.3 dim.cxx
   6 --- basic/source/comp/dim.cxx   17 Feb 2004 12:59:22 -0000      1.10.32.3
   7 +++ basic/source/comp/dim.cxx   29 Apr 2004 15:44:09 -0000
   8 @@ -794,6 +794,24 @@ void SbiParser::Declare()
   9         }
  10  }
  11
  12 +void SbiParser::Attribute()
  13 +{
  14 +       // TODO: Need to implement the method as an attributed object.
  15 +       while( Next() != EQ )
  16 +       {
  17 +               String aSym( GetSym() );
  18 +               if( Next() != DOT)
  19 +                       break;
  20 +       }
  21 +
  22 +       if( eCurTok != EQ )
  23 +               Error( SbERR_SYNTAX );
  24 +       else
  25 +               SbiExpression aValue( this );
  26 +
  27 +       // Don't generate any code - just discard it.
  28 +}
  29 +
  30  // Aufruf einer SUB oder FUNCTION
  31
  32  void SbiParser::Call()
  33 Index: basic/source/comp/parser.cxx
  34 ===================================================================
  35 RCS file: /cvs/script/basic/source/comp/parser.cxx,v
  36 retrieving revision 1.5.32.1
  37 diff -u -p -u -r1.5.32.1 parser.cxx
  38 --- basic/source/comp/parser.cxx        20 Jan 2004 09:59:25 -0000      1.5.32.1
  39 +++ basic/source/comp/parser.cxx        29 Apr 2004 15:44:09 -0000
  40 @@ -83,6 +83,7 @@ struct SbiStatement {
  41  #define        N       FALSE
  42
  43  static SbiStatement StmntTable [] = {
  44 +{ ATTRIBUTE, &SbiParser::Attribute, Y, Y, }, // ATTRIBUTE
  45  { CALL,                &SbiParser::Call,       N, Y, }, // CALL
  46  { CLOSE,       &SbiParser::Close,              N, Y, }, // CLOSE
  47  { _CONST_,     &SbiParser::Dim,                Y, Y, }, // CONST
  48 Index: basic/source/comp/token.cxx
  49 ===================================================================
  50 RCS file: /cvs/script/basic/source/comp/token.cxx,v
  51 retrieving revision 1.4.44.1
  52 diff -u -p -u -r1.4.44.1 token.cxx
  53 --- basic/source/comp/token.cxx 20 Jan 2004 10:00:20 -0000      1.4.44.1
  54 +++ basic/source/comp/token.cxx 29 Apr 2004 15:44:09 -0000
  55 @@ -89,6 +89,7 @@ static TokenTable aTokTable_Basic [] = {
  56         { ANY,          "Any" },
  57         { APPEND,       "Append" },
  58         { AS,           "As" },
  59 +       { ATTRIBUTE,"Attribute" },
  60         { BASE,         "Base" },
  61         { BINARY,       "Binary" },
  62         { TBOOLEAN,     "Boolean" },
  63
  64 Index: basic/source/inc/parser.hxx
  65 ===================================================================
  66 RCS file: /cvs/script/basic/source/inc/parser.hxx,v
  67 retrieving revision 1.1.1.1.134.1
  68 diff -u -p -u -r1.1.1.1.134.1 parser.hxx
  69 --- basic/source/inc/parser.hxx 20 Jan 2004 10:00:40 -0000      1.1.1.1.134.1
  70 +++ basic/source/inc/parser.hxx 4 May 2004 09:08:36 -0000
  71 @@ -136,6 +136,7 @@ public:
  72         void BadSyntax();                               // Falsches SbiToken
  73         void NoIf();                                    // ELSE/ELSE IF ohne IF
  74         void Assign();                                  // LET
  75 +       void Attribute();                               // Attribute
  76         void Call();                                    // CALL
  77         void Close();                                   // CLOSE
  78         void Declare();                                 // DECLARE
  79
  80 Index: basic/source/inc/token.hxx
  81 ===================================================================
  82 RCS file: /cvs/script/basic/source/inc/token.hxx,v
  83 retrieving revision 1.2.44.1
  84 diff -u -p -u -r1.2.44.1 token.hxx
  85 --- basic/source/inc/token.hxx  20 Jan 2004 10:02:31 -0000      1.2.44.1
  86 +++ basic/source/inc/token.hxx  4 May 2004 09:08:36 -0000
  87 @@ -108,7 +108,7 @@ enum SbiToken {
  88         IF, _IN_, INPUT,
  89         LET, LINE, LINEINPUT, LOCAL, LOOP, LPRINT, LSET,
  90         NAME, NEW, NEXT,
  91 -       ON, OPEN, OPTION, IMPLEMENTS,
  92 +       ON, OPEN, OPTION, ATTRIBUTE, IMPLEMENTS,
  93         PRINT, PRIVATE, PROPERTY, PUBLIC,
  94         REDIM, REM, RESUME, RETURN, RSET,
  95         SELECT, SET, SHARED, STATIC, STEP, STOP, SUB,