(file) Return to cimmof.y CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Compiler

Diff for /pegasus/src/Pegasus/Compiler/cimmof.y between version 1.50 and 1.51

version 1.50, 2007/10/17 20:50:46 version 1.51, 2007/11/20 18:36:32
Line 364 
Line 364 
 className: TOK_SIMPLE_IDENTIFIER {} ; className: TOK_SIMPLE_IDENTIFIER {} ;
  
  
 superClass: TOK_COLON className { $$ = new CIMName(*$2); }  superClass: TOK_COLON className
     | /* empty */ { $$ = new CIMName(); } ;  {
       $$ = new CIMName(*$2);
       delete $2;
   }
   | /* empty */
   {
       $$ = new CIMName();
   }
  
  
 classBody: TOK_LEFTCURLYBRACE classFeatures TOK_RIGHTCURLYBRACE TOK_SEMICOLON classBody: TOK_LEFTCURLYBRACE classFeatures TOK_RIGHTCURLYBRACE TOK_SEMICOLON
Line 443 
Line 450 
 methodEnd: TOK_SEMICOLON ; methodEnd: TOK_SEMICOLON ;
  
  
 methodName: TOK_SIMPLE_IDENTIFIER { $$ = new CIMName(*$1); } ;  methodName: TOK_SIMPLE_IDENTIFIER
   {
       $$ = new CIMName(*$1);
       delete $1;
   }
  
  
 // //
Line 565 
Line 576 
     | /* empty */ { $$ = new String(String::EMPTY); } ;     | /* empty */ { $$ = new String(String::EMPTY); } ;
  
  
 objectRef: className TOK_REF {  objectRef: className TOK_REF
     g_referenceClassName = *$1; } ;  {
       g_referenceClassName = *$1;
       delete $1;
   }
  
  
 parameterName: TOK_SIMPLE_IDENTIFIER { $$ = new CIMName(*$1); } ;  parameterName: TOK_SIMPLE_IDENTIFIER
   {
       $$ = new CIMName(*$1);
       delete $1;
   }
  
  
 propertyName: TOK_SIMPLE_IDENTIFIER { $$ = new CIMName(*$1); } ;  propertyName: TOK_SIMPLE_IDENTIFIER
   {
       $$ = new CIMName(*$1);
       delete $1;
   }
  
  
 array: TOK_LEFTSQUAREBRACKET TOK_POSITIVE_DECIMAL_VALUE array: TOK_LEFTSQUAREBRACKET TOK_POSITIVE_DECIMAL_VALUE
Line 1004 
Line 1026 
 qualifierDeclaration: TOK_QUALIFIER qualifierName qualifierValue scope qualifierDeclaration: TOK_QUALIFIER qualifierName qualifierValue scope
                        defaultFlavor TOK_SEMICOLON                        defaultFlavor TOK_SEMICOLON
 { {
 //    CIMQualifierDecl *qd = new CIMQualifierDecl($2, $3, $4, $5);  
     $$ = cimmofParser::Instance()->newQualifierDecl(*$2, $3, *$4, *$5);     $$ = cimmofParser::Instance()->newQualifierDecl(*$2, $3, *$4, *$5);
         delete $2;         delete $2;
     delete $3;  // CIMValue object created in qualifierValue production     delete $3;  // CIMValue object created in qualifierValue production
       delete $4;  // CIMScope object created in scope/metaElements production
 } ; } ;
  
  
Line 1031 
Line 1053 
  
 metaElements: metaElement { $$ = $1; } metaElements: metaElement { $$ = $1; }
     | metaElements TOK_COMMA metaElement     | metaElements TOK_COMMA metaElement
         { $$->addScope(*$3); } ;          {
               $$->addScope(*$3);
               delete $3;
           } ;
 // ATTN:  2001 P3 defer There is not CIMScope::SCHEMA. Spec Limit KS // ATTN:  2001 P3 defer There is not CIMScope::SCHEMA. Spec Limit KS
  
  
Line 1052 
Line 1077 
 defaultFlavor: TOK_COMMA flavorHead explicitFlavors TOK_RIGHTPAREN defaultFlavor: TOK_COMMA flavorHead explicitFlavors TOK_RIGHTPAREN
     { $$ = &g_flavor; }     { $$ = &g_flavor; }
 | /* empty */ | /* empty */
     { $$ = new CIMFlavor (CIMFlavor::NONE); } ;      {
           g_flavor = CIMFlavor (CIMFlavor::NONE);
           $$ = &g_flavor;
       } ;
  
  
 // Correction KS 4 March 2002 - set the defaults (was zero) // Correction KS 4 March 2002 - set the defaults (was zero)
Line 1087 
Line 1115 
  
 flavor: overrideFlavors { $$ = &g_flavor; } flavor: overrideFlavors { $$ = &g_flavor; }
     | /* empty */     | /* empty */
         { $$ = new CIMFlavor (CIMFlavor::NONE); };      {
           g_flavor = CIMFlavor (CIMFlavor::NONE);
           $$ = &g_flavor;
       } ;
  
  
 overrideFlavors: explicitFlavor overrideFlavors: explicitFlavor
Line 1160 
Line 1191 
         g_flavor = CIMFlavor (CIMFlavor::NONE); }         g_flavor = CIMFlavor (CIMFlavor::NONE); }
     | metaElement {     | metaElement {
         $$ = new String((*$1).toString ());         $$ = new String((*$1).toString ());
         g_flavor = CIMFlavor (CIMFlavor::NONE); } ;          g_flavor = CIMFlavor (CIMFlavor::NONE);
           delete $1; } ;
  
  
  


Legend:
Removed from v.1.50  
changed lines
  Added in v.1.51

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2