[openvrml-commit] openvrml/src/libopenvrml/openvrml Vrml97Parser.g,1.39,1.40

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13386/src/libopenvrml/openvrml

Modified Files:
	Vrml97Parser.g 
Log Message:
Cosmetic changes.

Index: Vrml97Parser.g
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/Vrml97Parser.g,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** Vrml97Parser.g	27 Nov 2005 16:58:15 -0000	1.39
--- Vrml97Parser.g	27 Nov 2005 20:15:49 -0000	1.40
***************
*** 637,645 ****
            const boost::shared_ptr<openvrml::scope> & scope]
  options { defaultErrorHandler=false; }
!     {
!         boost::intrusive_ptr<openvrml::node> node;
!         boost::shared_ptr<node_type> nodeType;
!     }
!     : node=nodeStatement[scene, scope, std::string()] {
              //
              // If we are unable to parse a node, node will be null.
--- 637,644 ----
            const boost::shared_ptr<openvrml::scope> & scope]
  options { defaultErrorHandler=false; }
! {
!     boost::intrusive_ptr<openvrml::node> node;
! }
!     :   node=nodeStatement[scene, scope, std::string()] {
              //
              // If we are unable to parse a node, node will be null.
***************
*** 647,652 ****
              if (node) { nodes.push_back(node); }
          }
!     | protoStatement[scene, scope]
!     | routeStatement[*scope]
      ;
  
--- 646,651 ----
              if (node) { nodes.push_back(node); }
          }
!     |   protoStatement[scene, scope]
!     |   routeStatement[*scope]
      ;
  
***************
*** 688,693 ****
      // XXX handle an exception here.
      //
!     : externproto[scene, scope]
!     | proto[scene, scope]
      ;
  
--- 687,692 ----
      // XXX handle an exception here.
      //
!     :   externproto[scene, scope]
!     |   proto[scene, scope]
      ;
  
***************
*** 844,854 ****
      boost::intrusive_ptr<openvrml::node> n;
  }
!     :   (protoStatement[scene, scope])*
!             n=protoNodeStatement[scene,
!                                  scope,
!                                  interfaces,
!                                  is_map,
!                                  routes,
!                                  std::string()]
          {
              assert(n);
--- 843,852 ----
      boost::intrusive_ptr<openvrml::node> n;
  }
!     :   (protoStatement[scene, scope])* n=protoNodeStatement[scene,
!                                                              scope,
!                                                              interfaces,
!                                                              is_map,
!                                                              routes,
!                                                              std::string()]
          {
              assert(n);
***************
*** 886,891 ****
              impl_nodes.push_back(n);
          }
!     | protoStatement[scene, scope]
!     | protoRouteStatement[*scope, routes]
      ;
  
--- 884,889 ----
              impl_nodes.push_back(n);
          }
!     |   protoStatement[scene, scope]
!     |   protoRouteStatement[*scope, routes]
      ;
  
***************
*** 946,950 ****
      shared_ptr<node_type> node_type;
  }
!     : KEYWORD_EXTERNPROTO id:ID LBRACKET
          (externInterfaceDeclaration[interfaces])* RBRACKET
          uri_list=externprotoUrlList {
--- 944,948 ----
      shared_ptr<node_type> node_type;
  }
!     :   KEYWORD_EXTERNPROTO id:ID LBRACKET
          (externInterfaceDeclaration[interfaces])* RBRACKET
          uri_list=externprotoUrlList {
***************
*** 1028,1033 ****
  interfaceType returns [node_interface::type_id interface_type]
  options { defaultErrorHandler=false; }
!     : interface_type=eventInterfaceType
!     | interface_type=fieldInterfaceType
      ;
  
--- 1026,1031 ----
  interfaceType returns [node_interface::type_id interface_type]
  options { defaultErrorHandler=false; }
!     :   interface_type=eventInterfaceType
!     |   interface_type=fieldInterfaceType
      ;
  
***************
*** 1189,1205 ****
      initial_value_map initial_values;
      node_interface_set interfaces;
!     boost::shared_ptr<node_type> nodeType;
  }
!     : { !LT(1)->getText().compare("Script") }? scriptId:ID LBRACE (
!             nodeBodyElement[scene,
!                             scope,
!                             script_node_interface_set,
!                             initial_values]
!             | scriptInterfaceDeclaration[scene,
!                                          scope,
!                                          interfaces,
!                                          initial_values,
!                                          node_id]
!         )* RBRACE {
              n = intrusive_ptr<openvrml::node>(
                  new script_node(scene.browser().script_node_class_,
--- 1187,1203 ----
      initial_value_map initial_values;
      node_interface_set interfaces;
!     boost::shared_ptr<openvrml::node_type> node_type;
  }
!     :   { !LT(1)->getText().compare("Script") }? scriptId:ID LBRACE
!             (   nodeBodyElement[scene,
!                                 scope,
!                                 script_node_interface_set,
!                                 initial_values]
!             |   scriptInterfaceDeclaration[scene,
!                                            scope,
!                                            interfaces,
!                                            initial_values,
!                                            node_id]
!             )* RBRACE {
              n = intrusive_ptr<openvrml::node>(
                  new script_node(scene.browser().script_node_class_,
***************
*** 1209,1215 ****
              if (!node_id.empty()) { n->id(node_id); }
          }
!     | nodeTypeId:ID {
!             nodeType = scope->find_type(nodeTypeId->getText());
!             if (!nodeType) {
                  throw SemanticException("unknown node type \""
                                          + nodeTypeId->getText() + "\"",
--- 1207,1213 ----
              if (!node_id.empty()) { n->id(node_id); }
          }
!     |   nodeTypeId:ID {
!             node_type = scope->find_type(nodeTypeId->getText());
!             if (!node_type) {
                  throw SemanticException("unknown node type \""
                                          + nodeTypeId->getText() + "\"",
***************
*** 1221,1229 ****
          } LBRACE (nodeBodyElement[scene,
                                    scope,
!                                   nodeType->interfaces(),
                                    initial_values])*
          RBRACE {
!             n = boost::intrusive_ptr<openvrml::node>(
!                 nodeType->create_node(scope, initial_values));
  
              if (!node_id.empty()) { n->id(node_id); }
--- 1219,1226 ----
          } LBRACE (nodeBodyElement[scene,
                                    scope,
!                                   node_type->interfaces(),
                                    initial_values])*
          RBRACE {
!             n = node_type->create_node(scope, initial_values);
  
              if (!node_id.empty()) { n->id(node_id); }
***************
*** 1309,1313 ****
      field_value::type_id ft(field_value::invalid_type_id);
  }
!     : it=eventInterfaceType ft=fieldType id:ID {
              const node_interface interface(it, ft, id->getText());
              const bool succeeded = interfaces.insert(interface).second;
--- 1306,1310 ----
      field_value::type_id ft(field_value::invalid_type_id);
  }
!     :   it=eventInterfaceType ft=fieldType id:ID {
              const node_interface interface(it, ft, id->getText());
              const bool succeeded = interfaces.insert(interface).second;
***************
*** 1324,1332 ****
              }
          }
!     | scriptFieldInterfaceDeclaration[scene,
!                                       scope,
!                                       interfaces,
!                                       initial_values,
!                                       node_id]
      ;
  
--- 1321,1329 ----
              }
          }
!     |   scriptFieldInterfaceDeclaration[scene,
!                                         scope,
!                                         interfaces,
!                                         initial_values,
!                                         node_id]
      ;
  
***************
*** 1383,1391 ****
      node_interface_set interfaces;
      is_list is_mappings;
!     boost::shared_ptr<node_type> nodeType;
  }
      :   (
!             { !LT(1)->getText().compare("Script") }? scriptId:ID LBRACE (
!                 protoNodeBodyElement[scene,
                                       scope,
                                       proto_interfaces,
--- 1380,1388 ----
      node_interface_set interfaces;
      is_list is_mappings;
!     boost::shared_ptr<openvrml::node_type> node_type;
  }
      :   (
!             { !LT(1)->getText().compare("Script") }? scriptId:ID LBRACE
!             (   protoNodeBodyElement[scene,
                                       scope,
                                       proto_interfaces,
***************
*** 1395,1407 ****
                                       initial_values,
                                       is_mappings]
!                 | protoScriptInterfaceDeclaration[scene,
!                                                   scope,
!                                                   proto_interfaces,
!                                                   is_map,
!                                                   routes,
!                                                   node_id,
!                                                   interfaces,
!                                                   initial_values,
!                                                   is_mappings]
              )* RBRACE {
                  n = boost::intrusive_ptr<openvrml::node>(
--- 1392,1404 ----
                                       initial_values,
                                       is_mappings]
!             |   protoScriptInterfaceDeclaration[scene,
!                                                 scope,
!                                                 proto_interfaces,
!                                                 is_map,
!                                                 routes,
!                                                 node_id,
!                                                 interfaces,
!                                                 initial_values,
!                                                 is_mappings]
              )* RBRACE {
                  n = boost::intrusive_ptr<openvrml::node>(
***************
*** 1412,1419 ****
                  if (!node_id.empty()) { n->id(node_id); }
              }
! 
!         | nodeTypeId:ID {
!                 nodeType = scope->find_type(nodeTypeId->getText());
!                 if (!nodeType) {
                      throw SemanticException("unknown node type \""
                                              + nodeTypeId->getText() + "\"",
--- 1409,1415 ----
                  if (!node_id.empty()) { n->id(node_id); }
              }
!         |   nodeTypeId:ID {
!                 node_type = scope->find_type(nodeTypeId->getText());
!                 if (!node_type) {
                      throw SemanticException("unknown node type \""
                                              + nodeTypeId->getText() + "\"",
***************
*** 1428,1435 ****
                                           is_map,
                                           routes,
!                                          nodeType->interfaces(),
                                           initial_values,
                                           is_mappings])* RBRACE {
!                 n = nodeType->create_node(scope, initial_values);
                  if (!node_id.empty()) { n->id(node_id); }
              }
--- 1424,1431 ----
                                           is_map,
                                           routes,
!                                          node_type->interfaces(),
                                           initial_values,
                                           is_mappings])* RBRACE {
!                 n = node_type->create_node(scope, initial_values);
                  if (!node_id.empty()) { n->id(node_id); }
              }
***************
*** 1472,1477 ****
          } ( {impl_node_interface->type == node_interface::field_id
              || impl_node_interface->type == node_interface::exposedfield_id}?
!             (
!                 fv=protoFieldValue[scene,
                                     scope,
                                     proto_interfaces,
--- 1468,1472 ----
          } ( {impl_node_interface->type == node_interface::field_id
              || impl_node_interface->type == node_interface::exposedfield_id}?
!             (   fv=protoFieldValue[scene,
                                     scope,
                                     proto_interfaces,
***************
*** 1488,1492 ****
              |   isStatement[impl_node_interface->id, is_mappings]
              )
!         | isStatement[impl_node_interface->id, is_mappings]
          )
      |   protoRouteStatement[*scope, routes]
--- 1483,1487 ----
              |   isStatement[impl_node_interface->id, is_mappings]
              )
!         |   isStatement[impl_node_interface->id, is_mappings]
          )
      |   protoRouteStatement[*scope, routes]
***************
*** 1561,1565 ****
      bool succeeded;
  }
!     : KEYWORD_FIELD ft=fieldType id:ID {
              succeeded =
                  interfaces.insert(node_interface(node_interface::field_id,
--- 1556,1560 ----
      bool succeeded;
  }
!     :   KEYWORD_FIELD ft=fieldType id:ID {
              succeeded =
                  interfaces.insert(node_interface(node_interface::field_id,
***************
*** 1589,1593 ****
                  assert(succeeded);
              }
!             | isStatement[id->getText(), is_mappings] {
                  using std::auto_ptr;
                  using boost::shared_ptr;
--- 1584,1588 ----
                  assert(succeeded);
              }
!         |   isStatement[id->getText(), is_mappings] {
                  using std::auto_ptr;
                  using boost::shared_ptr;
***************
*** 1615,1638 ****
      using openvrml::field_value;
  }
!     : FIELDTYPE_MFCOLOR     { ft = field_value::mfcolor_id; }
!     | FIELDTYPE_MFFLOAT     { ft = field_value::mffloat_id; }
!     | FIELDTYPE_MFINT32     { ft = field_value::mfint32_id; }
!     | FIELDTYPE_MFNODE      { ft = field_value::mfnode_id; }
!     | FIELDTYPE_MFROTATION  { ft = field_value::mfrotation_id; }
!     | FIELDTYPE_MFSTRING    { ft = field_value::mfstring_id; }
!     | FIELDTYPE_MFTIME      { ft = field_value::mftime_id; }
!     | FIELDTYPE_MFVEC2F     { ft = field_value::mfvec2f_id; }
!     | FIELDTYPE_MFVEC3F     { ft = field_value::mfvec3f_id; }
!     | FIELDTYPE_SFBOOL      { ft = field_value::sfbool_id; }
!     | FIELDTYPE_SFCOLOR     { ft = field_value::sfcolor_id; }
!     | FIELDTYPE_SFFLOAT     { ft = field_value::sffloat_id; }
!     | FIELDTYPE_SFIMAGE     { ft = field_value::sfimage_id; }
!     | FIELDTYPE_SFINT32     { ft = field_value::sfint32_id; }
!     | FIELDTYPE_SFNODE      { ft = field_value::sfnode_id; }
!     | FIELDTYPE_SFROTATION  { ft = field_value::sfrotation_id; }
!     | FIELDTYPE_SFSTRING    { ft = field_value::sfstring_id; }
!     | FIELDTYPE_SFTIME      { ft = field_value::sftime_id; }
!     | FIELDTYPE_SFVEC2F     { ft = field_value::sfvec2f_id; }
!     | FIELDTYPE_SFVEC3F     { ft = field_value::sfvec3f_id; }
      ;
  
--- 1610,1633 ----
      using openvrml::field_value;
  }
!     :   FIELDTYPE_MFCOLOR    { ft = field_value::mfcolor_id; }
!     |   FIELDTYPE_MFFLOAT    { ft = field_value::mffloat_id; }
!     |   FIELDTYPE_MFINT32    { ft = field_value::mfint32_id; }
!     |   FIELDTYPE_MFNODE     { ft = field_value::mfnode_id; }
!     |   FIELDTYPE_MFROTATION { ft = field_value::mfrotation_id; }
!     |   FIELDTYPE_MFSTRING   { ft = field_value::mfstring_id; }
!     |   FIELDTYPE_MFTIME     { ft = field_value::mftime_id; }
!     |   FIELDTYPE_MFVEC2F    { ft = field_value::mfvec2f_id; }
!     |   FIELDTYPE_MFVEC3F    { ft = field_value::mfvec3f_id; }
!     |   FIELDTYPE_SFBOOL     { ft = field_value::sfbool_id; }
!     |   FIELDTYPE_SFCOLOR    { ft = field_value::sfcolor_id; }
!     |   FIELDTYPE_SFFLOAT    { ft = field_value::sffloat_id; }
!     |   FIELDTYPE_SFIMAGE    { ft = field_value::sfimage_id; }
!     |   FIELDTYPE_SFINT32    { ft = field_value::sfint32_id; }
!     |   FIELDTYPE_SFNODE     { ft = field_value::sfnode_id; }
!     |   FIELDTYPE_SFROTATION { ft = field_value::sfrotation_id; }
!     |   FIELDTYPE_SFSTRING   { ft = field_value::sfstring_id; }
!     |   FIELDTYPE_SFTIME     { ft = field_value::sftime_id; }
!     |   FIELDTYPE_SFVEC2F    { ft = field_value::sfvec2f_id; }
!     |   FIELDTYPE_SFVEC3F    { ft = field_value::sfvec3f_id; }
      ;
  
***************
*** 1643,1649 ****
  returns [boost::shared_ptr<field_value> fv]
  options { defaultErrorHandler=false; }
!     : { (ft == field_value::sfnode_id) || (ft == field_value::mfnode_id) }?
          fv=nodeFieldValue[scene, scope, ft, node_id]
!     | fv=nonNodeFieldValue[ft]
      ;
  
--- 1638,1644 ----
  returns [boost::shared_ptr<field_value> fv]
  options { defaultErrorHandler=false; }
!     :   { (ft == field_value::sfnode_id) || (ft == field_value::mfnode_id) }?
          fv=nodeFieldValue[scene, scope, ft, node_id]
!     |   fv=nonNodeFieldValue[ft]
      ;
  
***************
*** 1657,1661 ****
  returns [boost::shared_ptr<field_value> fv]
  options { defaultErrorHandler=false; }
!     : { (ft == field_value::sfnode_id) || (ft == field_value::mfnode_id) }?
          fv=protoNodeFieldValue[scene,
                                 scope,
--- 1652,1656 ----
  returns [boost::shared_ptr<field_value> fv]
  options { defaultErrorHandler=false; }
!     :   { (ft == field_value::sfnode_id) || (ft == field_value::mfnode_id) }?
          fv=protoNodeFieldValue[scene,
                                 scope,
***************
*** 1667,1671 ****
              assert(fv);
          }
!     | fv=nonNodeFieldValue[ft] { assert(fv); }
      ;
  
--- 1662,1666 ----
              assert(fv);
          }
!     |   fv=nonNodeFieldValue[ft] { assert(fv); }
      ;
  
***************
*** 1673,1694 ****
  returns [boost::shared_ptr<field_value> fv]
  options { defaultErrorHandler=false; }
!     : { ft == field_value::sfbool_id }? fv=sfBoolValue
!     | { ft == field_value::sfcolor_id }? fv=sfColorValue
!     | { ft == field_value::sffloat_id }? fv=sfFloatValue
!     | { ft == field_value::sfimage_id }? fv=sfImageValue
!     | { ft == field_value::sfint32_id }? fv=sfInt32Value
!     | { ft == field_value::sfrotation_id }? fv=sfRotationValue
!     | { ft == field_value::sfstring_id }? fv=sfStringValue
!     | { ft == field_value::sftime_id }? fv=sfTimeValue
!     | { ft == field_value::sfvec2f_id }? fv=sfVec2fValue
!     | { ft == field_value::sfvec3f_id }? fv=sfVec3fValue
!     | { ft == field_value::mfcolor_id }? fv=mfColorValue
!     | { ft == field_value::mffloat_id }? fv=mfFloatValue
!     | { ft == field_value::mfint32_id }? fv=mfInt32Value
!     | { ft == field_value::mfrotation_id }? fv=mfRotationValue
!     | { ft == field_value::mfstring_id }? fv=mfStringValue
!     | { ft == field_value::mftime_id }? fv=mfTimeValue
!     | { ft == field_value::mfvec2f_id }? fv=mfVec2fValue
!     | fv=mfVec3fValue
      ;
  
--- 1668,1689 ----
  returns [boost::shared_ptr<field_value> fv]
  options { defaultErrorHandler=false; }
!     :   { ft == field_value::sfbool_id }? fv=sfBoolValue
!     |   { ft == field_value::sfcolor_id }? fv=sfColorValue
!     |   { ft == field_value::sffloat_id }? fv=sfFloatValue
!     |   { ft == field_value::sfimage_id }? fv=sfImageValue
!     |   { ft == field_value::sfint32_id }? fv=sfInt32Value
!     |   { ft == field_value::sfrotation_id }? fv=sfRotationValue
!     |   { ft == field_value::sfstring_id }? fv=sfStringValue
!     |   { ft == field_value::sftime_id }? fv=sfTimeValue
!     |   { ft == field_value::sfvec2f_id }? fv=sfVec2fValue
!     |   { ft == field_value::sfvec3f_id }? fv=sfVec3fValue
!     |   { ft == field_value::mfcolor_id }? fv=mfColorValue
!     |   { ft == field_value::mffloat_id }? fv=mfFloatValue
!     |   { ft == field_value::mfint32_id }? fv=mfInt32Value
!     |   { ft == field_value::mfrotation_id }? fv=mfRotationValue
!     |   { ft == field_value::mfstring_id }? fv=mfStringValue
!     |   { ft == field_value::mftime_id }? fv=mfTimeValue
!     |   { ft == field_value::mfvec2f_id }? fv=mfVec2fValue
!     |   fv=mfVec3fValue
      ;
  
***************
*** 1702,1707 ****
      using openvrml::field_value;
  }
!     :   { ft == field_value::sfnode_id }?
!             fv=sfNodeValue[scene, scope, script_node_id]
      |   fv=mfNodeValue[scene, scope, script_node_id]
      ;
--- 1697,1703 ----
      using openvrml::field_value;
  }
!     :   { ft == field_value::sfnode_id }? fv=sfNodeValue[scene,
!                                                          scope,
!                                                          script_node_id]
      |   fv=mfNodeValue[scene, scope, script_node_id]
      ;
***************
*** 1716,1725 ****
  returns [boost::shared_ptr<field_value> fv]
  options { defaultErrorHandler=false; }
!     :   { ft == field_value::sfnode_id }?
!             fv=protoSfNodeValue[scene,
!                                 scope,
!                                 proto_interfaces,
!                                 is_map, routes,
!                                 script_node_id]
      |   fv=protoMfNodeValue[scene,
                              scope,
--- 1712,1721 ----
  returns [boost::shared_ptr<field_value> fv]
  options { defaultErrorHandler=false; }
!     :   { ft == field_value::sfnode_id }? fv=protoSfNodeValue[scene,
!                                                               scope,
!                                                               proto_interfaces,
!                                                               is_map,
!                                                               routes,
!                                                               script_node_id]
      |   fv=protoMfNodeValue[scene,
                              scope,
***************
*** 1735,1745 ****
      bool val(false);
  }
!     : val=boolValue { sbv.reset(new sfbool(val)); }
      ;
  
  boolValue returns [bool val = false]
  options { defaultErrorHandler=false; }
!     : KEYWORD_TRUE { val = true; }
!     | KEYWORD_FALSE { val = false; }
      ;
  
--- 1731,1741 ----
      bool val(false);
  }
!     :   val=boolValue { sbv.reset(new sfbool(val)); }
      ;
  
  boolValue returns [bool val = false]
  options { defaultErrorHandler=false; }
!     :   KEYWORD_TRUE { val = true; }
!     |   KEYWORD_FALSE { val = false; }
      ;
  
***************
*** 1749,1753 ****
      color c;
  }
!     : colorValue[c] { scv.reset(new sfcolor(c)); }
      ;
  
--- 1745,1749 ----
      color c;
  }
!     :   colorValue[c] { scv.reset(new sfcolor(c)); }
      ;
  
***************
*** 1775,1781 ****
      float r, g, b;
  }
!     : r=colorComponent g=colorComponent b=colorComponent { c.r(r);
!                                                            c.g(g);
!                                                            c.b(b); }
      ;
  
--- 1771,1777 ----
      float r, g, b;
  }
!     :   r=colorComponent g=colorComponent b=colorComponent { c.r(r);
!                                                              c.g(g);
!                                                              c.b(b); }
      ;
  
***************
*** 1785,1789 ****
  colorComponent returns [float val = 0.0f]
  options { defaultErrorHandler=false; }
!     : val=floatValue {
              if (val < 0.0 || val > 1.0) {
                  this->reportWarning(
--- 1781,1785 ----
  colorComponent returns [float val = 0.0f]
  options { defaultErrorHandler=false; }
!     :   val=floatValue {
              if (val < 0.0 || val > 1.0) {
                  this->reportWarning(
***************
*** 1803,1807 ****
      float f;
  }
!     : f=floatValue { sfv.reset(new sffloat(f)); }
      ;
  
--- 1799,1803 ----
      float f;
  }
!     :   f=floatValue { sfv.reset(new sffloat(f)); }
      ;
  
***************
*** 1826,1831 ****
  floatValue returns [float val]
  options { defaultErrorHandler=false; }
!     : f0:REAL     { std::istringstream(f0->getText()) >> val; }
!     | f1:INTEGER  { std::istringstream(f1->getText()) >> val; }
      ;
  
--- 1822,1827 ----
  floatValue returns [float val]
  options { defaultErrorHandler=false; }
!     :   f0:REAL     { std::istringstream(f0->getText()) >> val; }
!     |   f1:INTEGER  { std::istringstream(f1->getText()) >> val; }
      ;
  
***************
*** 1868,1872 ****
      long i;
  }
!     : i=intValue { siv.reset(new sfint32(i)); }
      ;
  
--- 1864,1868 ----
      long i;
  }
!     :   i=intValue { siv.reset(new sfint32(i)); }
      ;
  
***************
*** 2004,2009 ****
  sfRotationValue returns [boost::shared_ptr<field_value> srv]
  options { defaultErrorHandler=false; }
!     { rotation r; }
!     : rotationValue[r] { srv.reset(new sfrotation(r)); }
      ;
  
--- 2000,2007 ----
  sfRotationValue returns [boost::shared_ptr<field_value> srv]
  options { defaultErrorHandler=false; }
! {
!     rotation r;
! }
!     :   rotationValue[r] { srv.reset(new sfrotation(r)); }
      ;
  
***************
*** 2031,2039 ****
  rotationValue[rotation & r]
  options { defaultErrorHandler=false; }
!     {
!         using openvrml_::fequal;
!         float x, y, z, angle;
!     }
!     : x=floatValue y=floatValue z=floatValue angle=floatValue {
              vec3f axis(x, y, z);
  
--- 2029,2037 ----
  rotationValue[rotation & r]
  options { defaultErrorHandler=false; }
! {
!     using openvrml_::fequal;
!     float x, y, z, angle;
! }
!     :   x=floatValue y=floatValue z=floatValue angle=floatValue {
              vec3f axis(x, y, z);
  
***************
*** 2054,2059 ****
  sfStringValue returns [boost::shared_ptr<field_value> ssv]
  options { defaultErrorHandler=false; }
!     { std::string s; }
!     : s=stringValue { ssv.reset(new sfstring(s)); }
      ;
  
--- 2052,2059 ----
  sfStringValue returns [boost::shared_ptr<field_value> ssv]
  options { defaultErrorHandler=false; }
! {
!     std::string s;
! }
!     :   s=stringValue { ssv.reset(new sfstring(s)); }
      ;
  
***************
*** 2079,2084 ****
  stringValue returns [std::string str]
  options { defaultErrorHandler=false; }
!     :   s:STRING
!         {
              using std::string;
              const string & token_text(s->getText());
--- 2079,2083 ----
  stringValue returns [std::string str]
  options { defaultErrorHandler=false; }
!     :   s:STRING {
              using std::string;
              const string & token_text(s->getText());
***************
*** 2102,2107 ****
  sfTimeValue returns [boost::shared_ptr<field_value> stv]
  options { defaultErrorHandler=false; }
!     { double t(0.0); }
!     : t=doubleValue { stv.reset(new sftime(t)); }
      ;
  
--- 2101,2108 ----
  sfTimeValue returns [boost::shared_ptr<field_value> stv]
  options { defaultErrorHandler=false; }
! {
!     double t(0.0);
! }
!     :   t=doubleValue { stv.reset(new sftime(t)); }
      ;
  
***************
*** 2126,2137 ****
  doubleValue returns [double val = 0.0]
  options { defaultErrorHandler=false; }
!     : d0:REAL    { std::istringstream(d0->getText()) >> val; }
!     | d1:INTEGER { std::istringstream(d1->getText()) >> val; }
      ;
  
  sfVec2fValue returns [boost::shared_ptr<field_value> svv]
  options { defaultErrorHandler=false; }
!     { vec2f v; }
!     : vec2fValue[v] { svv.reset(new sfvec2f(v)); }
      ;
  
--- 2127,2140 ----
  doubleValue returns [double val = 0.0]
  options { defaultErrorHandler=false; }
!     :   d0:REAL    { std::istringstream(d0->getText()) >> val; }
!     |   d1:INTEGER { std::istringstream(d1->getText()) >> val; }
      ;
  
  sfVec2fValue returns [boost::shared_ptr<field_value> svv]
  options { defaultErrorHandler=false; }
! {
!     vec2f v;
! }
!     :   vec2fValue[v] { svv.reset(new sfvec2f(v)); }
      ;
  
***************
*** 2159,2164 ****
      float x, y;
  }
!     : x=floatValue y=floatValue { v.x(x);
!                                   v.y(y); }
      ;
  
--- 2162,2167 ----
      float x, y;
  }
!     :   x=floatValue y=floatValue { v.x(x);
!                                     v.y(y); }
      ;
  
***************
*** 2168,2172 ****
      vec3f v;
  }
!     : vec3fValue[v] { svv.reset(new sfvec3f(v)); }
      ;
  
--- 2171,2175 ----
      vec3f v;
  }
!     :   vec3fValue[v] { svv.reset(new sfvec3f(v)); }
      ;
  
***************
*** 2194,2199 ****
      float x, y, z;
  }
!     : x=floatValue y=floatValue z=floatValue { v.x(x);
!                                                v.y(y);
!                                                v.z(z); }
      ;
--- 2197,2202 ----
      float x, y, z;
  }
!     :   x=floatValue y=floatValue z=floatValue { v.x(x);
!                                                  v.y(y);
!                                                  v.z(z); }
      ;