[openvrml-commit] openvrml/src/libopenvrml/openvrml Vrml97Parser.g,1.38,1.39 X3DVrmlParser.g,1.7,1.8 browser.cpp,1.104,1.105

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

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

Modified Files:
	Vrml97Parser.g X3DVrmlParser.g browser.cpp 
Log Message:
externproto_node_class will need to be constructed with an openvrml::scene rather than an openvrml::browser.

Index: X3DVrmlParser.g
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/X3DVrmlParser.g,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** X3DVrmlParser.g	27 Nov 2005 06:13:00 -0000	1.7
--- X3DVrmlParser.g	27 Nov 2005 16:58:15 -0000	1.8
***************
*** 207,211 ****
      :   profile=profileStatement { scene.profile_ = profile; }
          (componentStatement)* (metaStatement)*
!         (statement[scene.browser(), nodes, root_scope])*
      ;
  
--- 207,211 ----
      :   profile=profileStatement { scene.profile_ = profile; }
          (componentStatement)* (metaStatement)*
!         (statement[scene, nodes, root_scope])*
      ;
  

Index: browser.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -d -r1.104 -r1.105
*** browser.cpp	27 Nov 2005 06:13:00 -0000	1.104
--- browser.cpp	27 Nov 2005 16:58:15 -0000	1.105
***************
*** 2743,2747 ****
      public:
          externproto_node_class(
!             openvrml::browser & b,
              const std::vector<std::string> & uris) throw ();
          virtual ~externproto_node_class() throw ();
--- 2743,2747 ----
      public:
          externproto_node_class(
!             openvrml::scene & scene,
              const std::vector<std::string> & uris) throw ();
          virtual ~externproto_node_class() throw ();
***************
*** 5509,5516 ****
  
      externproto_node_class::
!     externproto_node_class(openvrml::browser & b,
                             const std::vector<std::string> & /* uris */)
          throw ():
!         node_class(b)
      {}
  
--- 5509,5516 ----
  
      externproto_node_class::
!     externproto_node_class(openvrml::scene & scene,
                             const std::vector<std::string> & /* uris */)
          throw ():
!         node_class(scene.browser())
      {}
  

Index: Vrml97Parser.g
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/Vrml97Parser.g,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** Vrml97Parser.g	27 Nov 2005 06:13:00 -0000	1.38
--- Vrml97Parser.g	27 Nov 2005 16:58:15 -0000	1.39
***************
*** 630,637 ****
      const boost::shared_ptr<openvrml::scope> root_scope(root_scope_auto_ptr);
  }
!     :   (statement[scene.browser(), nodes, root_scope])*
      ;
  
! statement[openvrml::browser & browser,
            std::vector<boost::intrusive_ptr<openvrml::node> > & nodes,
            const boost::shared_ptr<openvrml::scope> & scope]
--- 630,637 ----
      const boost::shared_ptr<openvrml::scope> root_scope(root_scope_auto_ptr);
  }
!     :   (statement[scene, nodes, root_scope])*
      ;
  
! statement[openvrml::scene & scene,
            std::vector<boost::intrusive_ptr<openvrml::node> > & nodes,
            const boost::shared_ptr<openvrml::scope> & scope]
***************
*** 641,645 ****
          boost::shared_ptr<node_type> nodeType;
      }
!     : node=nodeStatement[browser, scope, std::string()] {
              //
              // If we are unable to parse a node, node will be null.
--- 641,645 ----
          boost::shared_ptr<node_type> nodeType;
      }
!     : node=nodeStatement[scene, scope, std::string()] {
              //
              // If we are unable to parse a node, node will be null.
***************
*** 647,660 ****
              if (node) { nodes.push_back(node); }
          }
!     | protoStatement[browser, scope]
      | routeStatement[*scope]
      ;
  
! nodeStatement[openvrml::browser & browser,
                const boost::shared_ptr<openvrml::scope> & scope,
                const std::string & script_node_id]
  returns [boost::intrusive_ptr<openvrml::node> n]
  options { defaultErrorHandler=false; }
!     :   KEYWORD_DEF id0:ID n=node[browser, scope, id0->getText()]
      |   KEYWORD_USE id1:ID {
              if (id1->getText() == script_node_id) {
--- 647,660 ----
              if (node) { nodes.push_back(node); }
          }
!     | protoStatement[scene, scope]
      | routeStatement[*scope]
      ;
  
! nodeStatement[openvrml::scene & scene,
                const boost::shared_ptr<openvrml::scope> & scope,
                const std::string & script_node_id]
  returns [boost::intrusive_ptr<openvrml::node> n]
  options { defaultErrorHandler=false; }
!     :   KEYWORD_DEF id0:ID n=node[scene, scope, id0->getText()]
      |   KEYWORD_USE id1:ID {
              if (id1->getText() == script_node_id) {
***************
*** 678,685 ****
              }
          }
!     |   n=node[browser, scope, std::string()]
      ;
  
! protoStatement[openvrml::browser & browser, const boost::shared_ptr<openvrml::scope> & scope]
  options { defaultErrorHandler=false; }
      //
--- 678,686 ----
              }
          }
!     |   n=node[scene, scope, std::string()]
      ;
  
! protoStatement[openvrml::scene & scene,
!                const boost::shared_ptr<openvrml::scope> & scope]
  options { defaultErrorHandler=false; }
      //
***************
*** 687,695 ****
      // XXX handle an exception here.
      //
!     : externproto[browser, scope]
!     | proto[browser, scope]
      ;
  
! proto[openvrml::browser & browser,
        const boost::shared_ptr<openvrml::scope> & scope]
  options { defaultErrorHandler=false; }
--- 688,696 ----
      // XXX handle an exception here.
      //
!     : externproto[scene, scope]
!     | proto[scene, scope]
      ;
  
! proto[openvrml::scene & scene,
        const boost::shared_ptr<openvrml::scope> & scope]
  options { defaultErrorHandler=false; }
***************
*** 706,715 ****
              boost::shared_ptr<openvrml::scope>
                  proto_scope(new openvrml::scope(id->getText(), scope));
!         } LBRACKET (protoInterfaceDeclaration[browser,
                                                scope,
                                                id->getText(),
                                                interfaces,
                                                default_value_map])* RBRACKET
!         LBRACE protoBody[browser,
                           proto_scope,
                           interfaces,
--- 707,716 ----
              boost::shared_ptr<openvrml::scope>
                  proto_scope(new openvrml::scope(id->getText(), scope));
!         } LBRACKET (protoInterfaceDeclaration[scene,
                                                scope,
                                                id->getText(),
                                                interfaces,
                                                default_value_map])* RBRACKET
!         LBRACE protoBody[scene,
                           proto_scope,
                           interfaces,
***************
*** 718,722 ****
                           routes] RBRACE {
              boost::shared_ptr<openvrml::node_class>
!                 node_class(new proto_node_class(browser,
                                                  interfaces,
                                                  default_value_map,
--- 719,723 ----
                           routes] RBRACE {
              boost::shared_ptr<openvrml::node_class>
!                 node_class(new proto_node_class(scene.browser(),
                                                  interfaces,
                                                  default_value_map,
***************
*** 735,739 ****
              } while ((proto_scope = proto_scope->parent())->parent());
              impl_id = scope->id() + impl_id;
!             browser.add_node_class(impl_id, node_class);
  
              //
--- 736,740 ----
              } while ((proto_scope = proto_scope->parent())->parent());
              impl_id = scope->id() + impl_id;
!             scene.browser().add_node_class(impl_id, node_class);
  
              //
***************
*** 757,761 ****
  
  protoInterfaceDeclaration[
!     openvrml::browser & browser,
      const boost::shared_ptr<openvrml::scope> & outer_scope,
      const std::string & proto_id,
--- 758,762 ----
  
  protoInterfaceDeclaration[
!     openvrml::scene & scene,
      const boost::shared_ptr<openvrml::scope> & outer_scope,
      const std::string & proto_id,
***************
*** 794,798 ****
                  new scope(proto_id + '.' + id1->getText(), outer_scope));
          }
!         fv=fieldValue[browser, field_decl_scope, ft, std::string()] {
              assert(fv);
  
--- 795,799 ----
                  new scope(proto_id + '.' + id1->getText(), outer_scope));
          }
!         fv=fieldValue[scene, field_decl_scope, ft, std::string()] {
              assert(fv);
  
***************
*** 828,832 ****
      ;
  
! protoBody[openvrml::browser & browser,
            const boost::shared_ptr<openvrml::scope> & scope,
            const node_interface_set & interfaces,
--- 829,833 ----
      ;
  
! protoBody[openvrml::scene & scene,
            const boost::shared_ptr<openvrml::scope> & scope,
            const node_interface_set & interfaces,
***************
*** 843,848 ****
      boost::intrusive_ptr<openvrml::node> n;
  }
!     :   (protoStatement[browser, scope])*
!             n=protoNodeStatement[browser,
                                   scope,
                                   interfaces,
--- 844,849 ----
      boost::intrusive_ptr<openvrml::node> n;
  }
!     :   (protoStatement[scene, scope])*
!             n=protoNodeStatement[scene,
                                   scope,
                                   interfaces,
***************
*** 854,858 ****
              impl_nodes.push_back(n);
          }
!         (protoBodyStatement[browser,
                              scope,
                              interfaces,
--- 855,859 ----
              impl_nodes.push_back(n);
          }
!         (protoBodyStatement[scene,
                              scope,
                              interfaces,
***************
*** 862,871 ****
      ;
  
! protoBodyStatement[openvrml::browser & browser,
!                    const boost::shared_ptr<openvrml::scope> & scope,
!                    const node_interface_set & interfaces,
!                    std::vector<boost::intrusive_ptr<openvrml::node> > & impl_nodes,
!                    proto_node_class::is_map_t & is_map,
!                    proto_node_class::routes_t & routes]
  options { defaultErrorHandler=false; }
  {
--- 863,873 ----
      ;
  
! protoBodyStatement[
!     openvrml::scene & scene,
!     const boost::shared_ptr<openvrml::scope> & scope,
!     const node_interface_set & interfaces,
!     std::vector<boost::intrusive_ptr<openvrml::node> > & impl_nodes,
!     proto_node_class::is_map_t & is_map,
!     proto_node_class::routes_t & routes]
  options { defaultErrorHandler=false; }
  {
***************
*** 875,879 ****
      boost::intrusive_ptr<openvrml::node> n;
  }
!     :   n=protoNodeStatement[browser,
                               scope,
                               interfaces,
--- 877,881 ----
      boost::intrusive_ptr<openvrml::node> n;
  }
!     :   n=protoNodeStatement[scene,
                               scope,
                               interfaces,
***************
*** 884,892 ****
              impl_nodes.push_back(n);
          }
!     | protoStatement[browser, scope]
      | protoRouteStatement[*scope, routes]
      ;
  
! protoNodeStatement[openvrml::browser & browser,
                     const boost::shared_ptr<openvrml::scope> & scope,
                     const node_interface_set & proto_interfaces,
--- 886,894 ----
              impl_nodes.push_back(n);
          }
!     | protoStatement[scene, scope]
      | protoRouteStatement[*scope, routes]
      ;
  
! protoNodeStatement[openvrml::scene & scene,
                     const boost::shared_ptr<openvrml::scope> & scope,
                     const node_interface_set & proto_interfaces,
***************
*** 899,903 ****
      using antlr::SemanticException;
  }
!     :   KEYWORD_DEF id0:ID n=protoNode[browser,
                                         scope,
                                         proto_interfaces,
--- 901,905 ----
      using antlr::SemanticException;
  }
!     :   KEYWORD_DEF id0:ID n=protoNode[scene,
                                         scope,
                                         proto_interfaces,
***************
*** 924,928 ****
              }
          }
!     |   n=protoNode[browser,
                      scope,
                      proto_interfaces,
--- 926,930 ----
              }
          }
!     |   n=protoNode[scene,
                      scope,
                      proto_interfaces,
***************
*** 932,936 ****
      ;
  
! externproto[openvrml::browser & browser,
              const boost::shared_ptr<openvrml::scope> & scope]
  options { defaultErrorHandler=false; }
--- 934,938 ----
      ;
  
! externproto[openvrml::scene & scene,
              const boost::shared_ptr<openvrml::scope> & scope]
  options { defaultErrorHandler=false; }
***************
*** 952,956 ****
                   ++uri) {
                  const shared_ptr<openvrml::node_class> node_class =
!                     browser.node_class(*uri);
                  if (node_class) {
                      node_type = node_class->create_type(id->getText(),
--- 954,958 ----
                   ++uri) {
                  const shared_ptr<openvrml::node_class> node_class =
!                     scene.browser().node_class(*uri);
                  if (node_class) {
                      node_type = node_class->create_type(id->getText(),
***************
*** 962,971 ****
              if (!node_type) {
                  const shared_ptr<node_class> externproto_class(
!                     new externproto_node_class(browser, alt_uris));
  
                  for (vector<string>::const_iterator uri = alt_uris.begin();
                       uri != alt_uris.end();
                       ++uri) {
!                     browser.add_node_class(*uri, externproto_class);
                  }
  
--- 964,973 ----
              if (!node_type) {
                  const shared_ptr<node_class> externproto_class(
!                     new externproto_node_class(scene, alt_uris));
  
                  for (vector<string>::const_iterator uri = alt_uris.begin();
                       uri != alt_uris.end();
                       ++uri) {
!                     scene.browser().add_node_class(*uri, externproto_class);
                  }
  
***************
*** 1176,1180 ****
      ;
  
! node[openvrml::browser & browser,
       const boost::shared_ptr<openvrml::scope> & scope,
       const std::string & node_id]
--- 1178,1182 ----
      ;
  
! node[openvrml::scene & scene,
       const boost::shared_ptr<openvrml::scope> & scope,
       const std::string & node_id]
***************
*** 1190,1198 ****
  }
      : { !LT(1)->getText().compare("Script") }? scriptId:ID LBRACE (
!             nodeBodyElement[browser,
                              scope,
                              script_node_interface_set,
                              initial_values]
!             | scriptInterfaceDeclaration[browser,
                                           scope,
                                           interfaces,
--- 1192,1200 ----
  }
      : { !LT(1)->getText().compare("Script") }? scriptId:ID LBRACE (
!             nodeBodyElement[scene,
                              scope,
                              script_node_interface_set,
                              initial_values]
!             | scriptInterfaceDeclaration[scene,
                                           scope,
                                           interfaces,
***************
*** 1201,1205 ****
          )* RBRACE {
              n = intrusive_ptr<openvrml::node>(
!                 new script_node(browser.script_node_class_,
                                  scope,
                                  interfaces,
--- 1203,1207 ----
          )* RBRACE {
              n = intrusive_ptr<openvrml::node>(
!                 new script_node(scene.browser().script_node_class_,
                                  scope,
                                  interfaces,
***************
*** 1217,1226 ****
              }
  
!         } LBRACE (nodeBodyElement[browser,
                                    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,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); }
***************
*** 1248,1252 ****
      }
  
! nodeBodyElement[browser & b,
                  const boost::shared_ptr<openvrml::scope> & scope,
                  const node_interface_set & interfaces,
--- 1251,1255 ----
      }
  
! nodeBodyElement[openvrml::scene & scene,
                  const boost::shared_ptr<openvrml::scope> & scope,
                  const node_interface_set & interfaces,
***************
*** 1279,1283 ****
              }
              ft = interface->field_type;
!         } fv=fieldValue[b, scope, ft, std::string()] {
              assert(fv);
              const bool succeeded =
--- 1282,1286 ----
              }
              ft = interface->field_type;
!         } fv=fieldValue[scene, scope, ft, std::string()] {
              assert(fv);
              const bool succeeded =
***************
*** 1292,1299 ****
          }
      |   routeStatement[*scope]
!     |   protoStatement[b, scope]
      ;
  
! scriptInterfaceDeclaration[browser & b,
                             const boost::shared_ptr<openvrml::scope> & scope,
                             node_interface_set & interfaces,
--- 1295,1302 ----
          }
      |   routeStatement[*scope]
!     |   protoStatement[scene, scope]
      ;
  
! scriptInterfaceDeclaration[openvrml::scene & scene,
                             const boost::shared_ptr<openvrml::scope> & scope,
                             node_interface_set & interfaces,
***************
*** 1321,1325 ****
              }
          }
!     | scriptFieldInterfaceDeclaration[b,
                                        scope,
                                        interfaces,
--- 1324,1328 ----
              }
          }
!     | scriptFieldInterfaceDeclaration[scene,
                                        scope,
                                        interfaces,
***************
*** 1329,1333 ****
  
  scriptFieldInterfaceDeclaration[
!     browser & b,
      const boost::shared_ptr<openvrml::scope> & scope,
      node_interface_set & interfaces,
--- 1332,1336 ----
  
  scriptFieldInterfaceDeclaration[
!     openvrml::scene & scene,
      const boost::shared_ptr<openvrml::scope> & scope,
      node_interface_set & interfaces,
***************
*** 1342,1346 ****
      boost::shared_ptr<field_value> fv;
  }
!     :   KEYWORD_FIELD ft=fieldType id:ID fv=fieldValue[b,
                                                         scope,
                                                         ft,
--- 1345,1349 ----
      boost::shared_ptr<field_value> fv;
  }
!     :   KEYWORD_FIELD ft=fieldType id:ID fv=fieldValue[scene,
                                                         scope,
                                                         ft,
***************
*** 1366,1370 ****
      ;
  
! protoNode[openvrml::browser & browser,
            const boost::shared_ptr<openvrml::scope> & scope,
            const node_interface_set & proto_interfaces,
--- 1369,1373 ----
      ;
  
! protoNode[openvrml::scene & scene,
            const boost::shared_ptr<openvrml::scope> & scope,
            const node_interface_set & proto_interfaces,
***************
*** 1382,1388 ****
      boost::shared_ptr<node_type> nodeType;
  }
!     : (
              { !LT(1)->getText().compare("Script") }? scriptId:ID LBRACE (
!                 protoNodeBodyElement[browser,
                                       scope,
                                       proto_interfaces,
--- 1385,1391 ----
      boost::shared_ptr<node_type> nodeType;
  }
!     :   (
              { !LT(1)->getText().compare("Script") }? scriptId:ID LBRACE (
!                 protoNodeBodyElement[scene,
                                       scope,
                                       proto_interfaces,
***************
*** 1392,1396 ****
                                       initial_values,
                                       is_mappings]
!                 | protoScriptInterfaceDeclaration[browser,
                                                    scope,
                                                    proto_interfaces,
--- 1395,1399 ----
                                       initial_values,
                                       is_mappings]
!                 | protoScriptInterfaceDeclaration[scene,
                                                    scope,
                                                    proto_interfaces,
***************
*** 1403,1407 ****
              )* RBRACE {
                  n = boost::intrusive_ptr<openvrml::node>(
!                     new script_node(browser.script_node_class_,
                                      scope,
                                      interfaces,
--- 1406,1410 ----
              )* RBRACE {
                  n = boost::intrusive_ptr<openvrml::node>(
!                     new script_node(scene.browser().script_node_class_,
                                      scope,
                                      interfaces,
***************
*** 1420,1424 ****
                  }
              }
!             LBRACE (protoNodeBodyElement[browser,
                                           scope,
                                           proto_interfaces,
--- 1423,1427 ----
                  }
              }
!             LBRACE (protoNodeBodyElement[scene,
                                           scope,
                                           proto_interfaces,
***************
*** 1442,1446 ****
      ;
  
! protoNodeBodyElement[openvrml::browser & browser,
                       const boost::shared_ptr<openvrml::scope> & scope,
                       const node_interface_set & proto_interfaces,
--- 1445,1449 ----
      ;
  
! protoNodeBodyElement[openvrml::scene & scene,
                       const boost::shared_ptr<openvrml::scope> & scope,
                       const node_interface_set & proto_interfaces,
***************
*** 1470,1474 ****
              || impl_node_interface->type == node_interface::exposedfield_id}?
              (
!                 fv=protoFieldValue[browser,
                                     scope,
                                     proto_interfaces,
--- 1473,1477 ----
              || impl_node_interface->type == node_interface::exposedfield_id}?
              (
!                 fv=protoFieldValue[scene,
                                     scope,
                                     proto_interfaces,
***************
*** 1488,1492 ****
          )
      |   protoRouteStatement[*scope, routes]
!     |   protoStatement[browser, scope]
      ;
  
--- 1491,1495 ----
          )
      |   protoRouteStatement[*scope, routes]
!     |   protoStatement[scene, scope]
      ;
  
***************
*** 1500,1512 ****
      ;
  
! protoScriptInterfaceDeclaration[openvrml::browser & browser,
!                                 const boost::shared_ptr<openvrml::scope> & scope,
!                                 const node_interface_set & proto_interfaces,
!                                 proto_node_class::is_map_t & is_map,
!                                 proto_node_class::routes_t & routes,
!                                 const std::string & script_node_id,
!                                 node_interface_set & interfaces,
!                                 initial_value_map & initial_values,
!                                 is_list & is_mappings]
  options { defaultErrorHandler=false; }
  {
--- 1503,1516 ----
      ;
  
! protoScriptInterfaceDeclaration[
!     openvrml::scene & scene,
!     const boost::shared_ptr<openvrml::scope> & scope,
!     const node_interface_set & proto_interfaces,
!     proto_node_class::is_map_t & is_map,
!     proto_node_class::routes_t & routes,
!     const std::string & script_node_id,
!     node_interface_set & interfaces,
!     initial_value_map & initial_values,
!     is_list & is_mappings]
  options { defaultErrorHandler=false; }
  {
***************
*** 1530,1534 ****
              }
          } (isStatement[id->getText(), is_mappings])?
!     |   protoScriptFieldInterfaceDeclaration[browser,
                                               scope,
                                               proto_interfaces,
--- 1534,1538 ----
              }
          } (isStatement[id->getText(), is_mappings])?
!     |   protoScriptFieldInterfaceDeclaration[scene,
                                               scope,
                                               proto_interfaces,
***************
*** 1542,1546 ****
  
  protoScriptFieldInterfaceDeclaration[
!     openvrml::browser & browser,
      const boost::shared_ptr<openvrml::scope> & scope,
      const node_interface_set & proto_interfaces,
--- 1546,1550 ----
  
  protoScriptFieldInterfaceDeclaration[
!     openvrml::scene & scene,
      const boost::shared_ptr<openvrml::scope> & scope,
      const node_interface_set & proto_interfaces,
***************
*** 1573,1577 ****
              }
          } (
!             fv=protoFieldValue[browser,
                                 scope,
                                 proto_interfaces,
--- 1577,1581 ----
              }
          } (
!             fv=protoFieldValue[scene,
                                 scope,
                                 proto_interfaces,
***************
*** 1633,1637 ****
      ;
  
! fieldValue[openvrml::browser & browser,
             const boost::shared_ptr<openvrml::scope> & scope,
             const openvrml::field_value::type_id ft,
--- 1637,1641 ----
      ;
  
! fieldValue[openvrml::scene & scene,
             const boost::shared_ptr<openvrml::scope> & scope,
             const openvrml::field_value::type_id ft,
***************
*** 1640,1648 ****
  options { defaultErrorHandler=false; }
      : { (ft == field_value::sfnode_id) || (ft == field_value::mfnode_id) }?
!         fv=nodeFieldValue[browser, scope, ft, node_id]
      | fv=nonNodeFieldValue[ft]
      ;
  
! protoFieldValue[openvrml::browser & browser,
                  const boost::shared_ptr<openvrml::scope> & scope,
                  const node_interface_set & proto_interfaces,
--- 1644,1652 ----
  options { defaultErrorHandler=false; }
      : { (ft == field_value::sfnode_id) || (ft == field_value::mfnode_id) }?
!         fv=nodeFieldValue[scene, scope, ft, node_id]
      | fv=nonNodeFieldValue[ft]
      ;
  
! protoFieldValue[openvrml::scene & scene,
                  const boost::shared_ptr<openvrml::scope> & scope,
                  const node_interface_set & proto_interfaces,
***************
*** 1654,1658 ****
  options { defaultErrorHandler=false; }
      : { (ft == field_value::sfnode_id) || (ft == field_value::mfnode_id) }?
!         fv=protoNodeFieldValue[browser,
                                 scope,
                                 proto_interfaces,
--- 1658,1662 ----
  options { defaultErrorHandler=false; }
      : { (ft == field_value::sfnode_id) || (ft == field_value::mfnode_id) }?
!         fv=protoNodeFieldValue[scene,
                                 scope,
                                 proto_interfaces,
***************
*** 1689,1693 ****
      ;
  
! nodeFieldValue[openvrml::browser & browser,
                 const boost::shared_ptr<openvrml::scope> & scope,
                 openvrml::field_value::type_id ft,
--- 1693,1697 ----
      ;
  
! nodeFieldValue[openvrml::scene & scene,
                 const boost::shared_ptr<openvrml::scope> & scope,
                 openvrml::field_value::type_id ft,
***************
*** 1699,1707 ****
  }
      :   { ft == field_value::sfnode_id }?
!             fv=sfNodeValue[browser, scope, script_node_id]
!     |   fv=mfNodeValue[browser, scope, script_node_id]
      ;
  
! protoNodeFieldValue[openvrml::browser & browser,
                      const boost::shared_ptr<openvrml::scope> & scope,
                      const node_interface_set & proto_interfaces,
--- 1703,1711 ----
  }
      :   { ft == field_value::sfnode_id }?
!             fv=sfNodeValue[scene, scope, script_node_id]
!     |   fv=mfNodeValue[scene, scope, script_node_id]
      ;
  
! protoNodeFieldValue[openvrml::scene & scene,
                      const boost::shared_ptr<openvrml::scope> & scope,
                      const node_interface_set & proto_interfaces,
***************
*** 1713,1722 ****
  options { defaultErrorHandler=false; }
      :   { ft == field_value::sfnode_id }?
!             fv=protoSfNodeValue[browser,
                                  scope,
                                  proto_interfaces,
                                  is_map, routes,
                                  script_node_id]
!     |   fv=protoMfNodeValue[browser,
                              scope,
                              proto_interfaces,
--- 1717,1726 ----
  options { defaultErrorHandler=false; }
      :   { ft == field_value::sfnode_id }?
!             fv=protoSfNodeValue[scene,
                                  scope,
                                  proto_interfaces,
                                  is_map, routes,
                                  script_node_id]
!     |   fv=protoMfNodeValue[scene,
                              scope,
                              proto_interfaces,
***************
*** 1895,1899 ****
      ;
  
! sfNodeValue[openvrml::browser & browser,
              const boost::shared_ptr<openvrml::scope> & scope,
              const std::string & script_node_id]
--- 1899,1903 ----
      ;
  
! sfNodeValue[openvrml::scene & scene,
              const boost::shared_ptr<openvrml::scope> & scope,
              const std::string & script_node_id]
***************
*** 1903,1907 ****
      boost::intrusive_ptr<openvrml::node> n;
  }
!     :   n=nodeStatement[browser, scope, script_node_id] {
              snv.reset(new sfnode(n));
          }
--- 1907,1911 ----
      boost::intrusive_ptr<openvrml::node> n;
  }
!     :   n=nodeStatement[scene, scope, script_node_id] {
              snv.reset(new sfnode(n));
          }
***************
*** 1909,1913 ****
      ;
  
! protoSfNodeValue[openvrml::browser & browser,
                   const boost::shared_ptr<openvrml::scope> & scope,
                   const node_interface_set & proto_interfaces,
--- 1913,1917 ----
      ;
  
! protoSfNodeValue[openvrml::scene & scene,
                   const boost::shared_ptr<openvrml::scope> & scope,
                   const node_interface_set & proto_interfaces,
***************
*** 1920,1924 ****
      boost::intrusive_ptr<openvrml::node> n;
  }
!     :   n=protoNodeStatement[browser,
                               scope,
                               proto_interfaces,
--- 1924,1928 ----
      boost::intrusive_ptr<openvrml::node> n;
  }
!     :   n=protoNodeStatement[scene,
                               scope,
                               proto_interfaces,
***************
*** 1933,1937 ****
      ;
  
! mfNodeValue[openvrml::browser & browser,
              const boost::shared_ptr<openvrml::scope> & scope,
              const std::string & script_node_id]
--- 1937,1941 ----
      ;
  
! mfNodeValue[openvrml::scene & scene,
              const boost::shared_ptr<openvrml::scope> & scope,
              const std::string & script_node_id]
***************
*** 1945,1949 ****
      mfnode & nodes = static_cast<mfnode &>(*mnv);
  }
!     :   n=nodeStatement[browser, scope, script_node_id] {
              if (n) { nodes.value(mfnode::value_type(1, n)); }
          }
--- 1949,1953 ----
      mfnode & nodes = static_cast<mfnode &>(*mnv);
  }
!     :   n=nodeStatement[scene, scope, script_node_id] {
              if (n) { nodes.value(mfnode::value_type(1, n)); }
          }
***************
*** 1951,1955 ****
              mfnode::value_type value;
          } (
!             n=nodeStatement[browser, scope, script_node_id] {
                  if (n) { value.push_back(n); }
              }
--- 1955,1959 ----
              mfnode::value_type value;
          } (
!             n=nodeStatement[scene, scope, script_node_id] {
                  if (n) { value.push_back(n); }
              }
***************
*** 1959,1963 ****
      ;
  
! protoMfNodeValue[openvrml::browser & browser,
                   const boost::shared_ptr<openvrml::scope> & scope,
                   const node_interface_set & proto_interfaces,
--- 1963,1967 ----
      ;
  
! protoMfNodeValue[openvrml::scene & scene,
                   const boost::shared_ptr<openvrml::scope> & scope,
                   const node_interface_set & proto_interfaces,
***************
*** 1974,1978 ****
      mfnode & nodes = static_cast<mfnode &>(*mnv);
  }
!     :   n=protoNodeStatement[browser,
                               scope,
                               proto_interfaces,
--- 1978,1982 ----
      mfnode & nodes = static_cast<mfnode &>(*mnv);
  }
!     :   n=protoNodeStatement[scene,
                               scope,
                               proto_interfaces,
***************
*** 1985,1989 ****
              mfnode::value_type value;
          } (
!             n=protoNodeStatement[browser,
                                   scope,
                                   proto_interfaces,
--- 1989,1993 ----
              mfnode::value_type value;
          } (
!             n=protoNodeStatement[scene,
                                   scope,
                                   proto_interfaces,