x_ite 4.0.5 → 4.7.5

package/src/x_ite/Parser/Parser.js

@@ -48,14 +48,14 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Fields",
+	"x_ite/Parser/X3DParser",
 	"x_ite/Prototype/X3DExternProtoDeclaration",
 	"x_ite/Prototype/X3DProtoDeclaration",
 	"x_ite/Bits/X3DConstants",
 ],
-function ($,
-          Fields,
+function (Fields,
+          X3DParser,
           X3DExternProtoDeclaration,
           X3DProtoDeclaration,
           X3DConstants)
@@ -81,151 +81,153 @@ function ($,
 	 *  Grammar
 	 */
 
-	// VRML lexical elements
-	var Grammar =
-	{
-		// General
-		Whitespaces: /^([\x20\n,\t\r]+)/,
-		Comment:     /^#(.*?)(?=[\n\r])/,
-
-		// Header
-		Header:	    /^#(VRML|X3D) V(.*?) (utf8)(?: (.*?))?[\n\r]/,
-
-		// Keywords
-		AS:          /^AS/,
-		COMPONENT:   /^COMPONENT/,
-		DEF:         /^DEF/,
-		EXPORT:      /^EXPORT/,
-		EXTERNPROTO: /^EXTERNPROTO/,
-		FALSE:       /^FALSE/,
-		false:       /^false/,
-		IMPORT:      /^IMPORT/,
-		IS:          /^IS/,
-		META:        /^META/,
-		NULL:        /^NULL/,
-		TRUE:        /^TRUE/,
-		true:        /^true/,
-		PROFILE:     /^PROFILE/,
-		PROTO:       /^PROTO/,
-		ROUTE:       /^ROUTE/,
-		TO:          /^TO/,
-		UNIT:        /^UNIT/,
-		USE:         /^USE/,
-
-		// Terminal symbols
-		OpenBrace:    /^\{/,
-		CloseBrace:   /^\}/,
-		OpenBracket:  /^\[/,
-		CloseBracket: /^\]/,
-		Period:       /^\./,
-		Colon:        /^\:/,
-
-		Id: /^([^\x30-\x39\x00-\x20\x22\x23\x27\x2b\x2c\x2d\x2e\x5b\x5c\x5d\x7b\x7d\x7f]{1}[^\x00-\x20\x22\x23\x27\x2c\x2e\x5b\x5c\x5d\x7b\x7d\x7f]*)/,
-		ComponentNameId: /^([^\x30-\x39\x00-\x20\x22\x23\x27\x2b\x2c\x2d\x2e\x5b\x5c\x5d\x7b\x7d\x7f\x3a]{1}[^\x00-\x20\x22\x23\x27\x2c\x2e\x5b\x5c\x5d\x7b\x7d\x7f\x3a]*)/,
-
-		initializeOnly: /^initializeOnly/,
-		inputOnly:      /^inputOnly/,
-		outputOnly:     /^outputOnly/,
-		inputOutput:    /^inputOutput/,
-
-		field:        /^field/,
-		eventIn:      /^eventIn/,
-		eventOut:     /^eventOut/,
-		exposedField: /^exposedField/,
 
-		FieldType: /^(MFBool|MFColorRGBA|MFColor|MFDouble|MFFloat|MFImage|MFInt32|MFMatrix3d|MFMatrix3f|MFMatrix4d|MFMatrix4f|MFNode|MFRotation|MFString|MFTime|MFVec2d|MFVec2f|MFVec3d|MFVec3f|MFVec4d|MFVec4f|SFBool|SFColorRGBA|SFColor|SFDouble|SFFloat|SFImage|SFInt32|SFMatrix3d|SFMatrix3f|SFMatrix4d|SFMatrix4f|SFNode|SFRotation|SFString|SFTime|SFVec2d|SFVec2f|SFVec3d|SFVec3f|SFVec4d|SFVec4f)/,
-
-		// Values
-		int32:  /^((?:0[xX][\da-fA-F]+)|(?:[+-]?\d+))/,
-		double: /^([+-]?(?:(?:(?:\d*\.\d+)|(?:\d+(?:\.)?))(?:[eE][+-]?\d+)?))/,
-		string: /^"((?:[^"\\]|\\\\|\\")*)"/,
-
-		Inf:         /^[+]?inf/i,
-		NegativeInf: /^-inf/i,
-		NaN:         /^[+-]?nan/i,
-
-		// Misc
-		Break: /\r?\n/g,
-	};
-
-	function parse (parser)
-	{
-		this .lastIndex = 0;
-		parser .result  = this .exec (parser .input);
-
-		if (parser .result)
-		{
-			parser .input = parser .input .slice (parser .result [0] .length);
-			return true;
-		}
-
-		return false;
-	}
-
-
-/*
+//	Comment out scriptBody function fragments
+//
+//	// VRML lexical elements
+//	var Grammar =
+//	{
+//		// General
+//		Whitespaces: /^([\x20\n,\t\r]+)/,
+//		Comment:     /^#(.*?)(?=[\n\r])/,
+//
+//		// Header
+//		Header:	    /^#(VRML|X3D) V(.*?) (utf8)(?: (.*?))?[\n\r]/,
+//
+//		// Keywords
+//		AS:          /^AS/,
+//		COMPONENT:   /^COMPONENT/,
+//		DEF:         /^DEF/,
+//		EXPORT:      /^EXPORT/,
+//		EXTERNPROTO: /^EXTERNPROTO/,
+//		FALSE:       /^FALSE/,
+//		false:       /^false/,
+//		IMPORT:      /^IMPORT/,
+//		IS:          /^IS/,
+//		META:        /^META/,
+//		NULL:        /^NULL/,
+//		TRUE:        /^TRUE/,
+//		true:        /^true/,
+//		PROFILE:     /^PROFILE/,
+//		PROTO:       /^PROTO/,
+//		ROUTE:       /^ROUTE/,
+//		TO:          /^TO/,
+//		UNIT:        /^UNIT/,
+//		USE:         /^USE/,
+//
+//		// Terminal symbols
+//		OpenBrace:    /^\{/,
+//		CloseBrace:   /^\}/,
+//		OpenBracket:  /^\[/,
+//		CloseBracket: /^\]/,
+//		Period:       /^\./,
+//		Colon:        /^\:/,
+//
+//		Id: /^([^\x30-\x39\x00-\x20\x22\x23\x27\x2b\x2c\x2d\x2e\x5b\x5c\x5d\x7b\x7d\x7f]{1}[^\x00-\x20\x22\x23\x27\x2c\x2e\x5b\x5c\x5d\x7b\x7d\x7f]*)/,
+//		ComponentNameId: /^([^\x30-\x39\x00-\x20\x22\x23\x27\x2b\x2c\x2d\x2e\x5b\x5c\x5d\x7b\x7d\x7f\x3a]{1}[^\x00-\x20\x22\x23\x27\x2c\x2e\x5b\x5c\x5d\x7b\x7d\x7f\x3a]*)/,
+//
+//		initializeOnly: /^initializeOnly/,
+//		inputOnly:      /^inputOnly/,
+//		outputOnly:     /^outputOnly/,
+//		inputOutput:    /^inputOutput/,
+//
+//		field:        /^field/,
+//		eventIn:      /^eventIn/,
+//		eventOut:     /^eventOut/,
+//		exposedField: /^exposedField/,
+//
+//		FieldType: /^(MFBool|MFColorRGBA|MFColor|MFDouble|MFFloat|MFImage|MFInt32|MFMatrix3d|MFMatrix3f|MFMatrix4d|MFMatrix4f|MFNode|MFRotation|MFString|MFTime|MFVec2d|MFVec2f|MFVec3d|MFVec3f|MFVec4d|MFVec4f|SFBool|SFColorRGBA|SFColor|SFDouble|SFFloat|SFImage|SFInt32|SFMatrix3d|SFMatrix3f|SFMatrix4d|SFMatrix4f|SFNode|SFRotation|SFString|SFTime|SFVec2d|SFVec2f|SFVec3d|SFVec3f|SFVec4d|SFVec4f)/,
+//
+//		// Values
+//		int32:  /^((?:0[xX][\da-fA-F]+)|(?:[+-]?\d+))/,
+//		double: /^([+-]?(?:(?:(?:\d*\.\d+)|(?:\d+(?:\.)?))(?:[eE][+-]?\d+)?))/,
+//		string: /^"((?:[^"\\]|\\\\|\\")*)"/,
+//
+//		Inf:         /^[+]?inf/i,
+//		NegativeInf: /^-inf/i,
+//		NaN:         /^[+-]?nan/i,
+//
+//		// Misc
+//		Break: /\r?\n/g,
+//	};
+//
+//	function parse (parser)
+//	{
+//		this .lastIndex = 0;
+//		parser .result  = this .exec (parser .input);
+//
+//		if (parser .result)
+//		{
+//			parser .input = parser .input .slice (parser .result [0] .length);
+//			return true;
+//		}
+//
+//		return false;
+//	}
+
+
+	// Comment out scriptBody function fragments
+	//
 	// VRML lexical elements
 	var Grammar =
 	{
 		// General
-		Whitespaces: new RegExp ('^([\\x20\\n,\\t\\r]+)', 'y'),
-		Comment:     new RegExp ('^#(.*?)(?=[\\n\\r])',   'y'),
+		Whitespaces: new RegExp ('([\\x20\\n,\\t\\r]+)', 'gy'),
+		Comment:     new RegExp ('#(.*?)(?=[\\n\\r])',   'gy'),
 
 		// Header
-		Header:	    new RegExp ("^#(VRML|X3D) V(.*?) (utf8)(?: (.*?))?[\\n\\r]", 'y'),
+		Header:	    new RegExp ("^#(VRML|X3D) V(.*?) (utf8)(?:[ \\t]+(.*?))?[ \\t]*[\\n\\r]", 'gy'),
 
 		// Keywords
-		AS:          new RegExp ('^AS',          'y'),
-		COMPONENT:   new RegExp ('^COMPONENT',   'y'),
-		DEF:         new RegExp ('^DEF',         'y'),
-		EXPORT:      new RegExp ('^EXPORT',      'y'),
-		EXTERNPROTO: new RegExp ('^EXTERNPROTO', 'y'),
-		FALSE:       new RegExp ('^FALSE',       'y'),
-		false:       new RegExp ('^false',       'y'),
-		IMPORT:      new RegExp ('^IMPORT',      'y'),
-		IS:          new RegExp ('^IS',          'y'),
-		META:        new RegExp ('^META',        'y'),
-		NULL:        new RegExp ('^NULL',        'y'),
-		TRUE:        new RegExp ('^TRUE',        'y'),
-		true:        new RegExp ('^true',        'y'),
-		PROFILE:     new RegExp ('^PROFILE',     'y'),
-		PROTO:       new RegExp ('^PROTO',       'y'),
-		ROUTE:       new RegExp ('^ROUTE',       'y'),
-		TO:          new RegExp ('^TO',          'y'),
-		UNIT:        new RegExp ('^UNIT',        'y'),
-		USE:         new RegExp ('^USE',         'y'),
+		AS:          new RegExp ('AS',          'gy'),
+		COMPONENT:   new RegExp ('COMPONENT',   'gy'),
+		DEF:         new RegExp ('DEF',         'gy'),
+		EXPORT:      new RegExp ('EXPORT',      'gy'),
+		EXTERNPROTO: new RegExp ('EXTERNPROTO', 'gy'),
+		FALSE:       new RegExp ('FALSE|false', 'gy'),
+		IMPORT:      new RegExp ('IMPORT',      'gy'),
+		IS:          new RegExp ('IS',          'gy'),
+		META:        new RegExp ('META',        'gy'),
+		NULL:        new RegExp ('NULL',        'gy'),
+		TRUE:        new RegExp ('TRUE|true',   'gy'),
+		PROFILE:     new RegExp ('PROFILE',     'gy'),
+		PROTO:       new RegExp ('PROTO',       'gy'),
+		ROUTE:       new RegExp ('ROUTE',       'gy'),
+		TO:          new RegExp ('TO',          'gy'),
+		UNIT:        new RegExp ('UNIT',        'gy'),
+		USE:         new RegExp ('USE',         'gy'),
 
 		// Terminal symbols
-		OpenBrace:    new RegExp ('^\\{', 'y'),
-		CloseBrace:   new RegExp ('^\\}', 'y'),
-		OpenBracket:  new RegExp ('^\\[', 'y'),
-		CloseBracket: new RegExp ('^\\]', 'y'),
-		Period:       new RegExp ('^\\.', 'y'),
-		Colon:        new RegExp ('^\\:', 'y'),
+		OpenBrace:    new RegExp ('\\{', 'gy'),
+		CloseBrace:   new RegExp ('\\}', 'gy'),
+		OpenBracket:  new RegExp ('\\[', 'gy'),
+		CloseBracket: new RegExp ('\\]', 'gy'),
+		Period:       new RegExp ('\\.', 'gy'),
+		Colon:        new RegExp ('\\:', 'gy'),
 
-		Id: new RegExp ('^([^\\x30-\\x39\\x00-\\x20\\x22\\x23\\x27\\x2b\\x2c\\x2d\\x2e\\x5b\\x5c\\x5d\\x7b\\x7d\\x7f]{1}[^\\x00-\\x20\\x22\\x23\\x27\\x2c\\x2e\\x5b\\x5c\\x5d\\x7b\\x7d\\x7f]*)', 'y'),
-		ComponentNameId: new RegExp ('^([^\\x30-\\x39\\x00-\\x20\\x22\\x23\\x27\\x2b\\x2c\\x2d\\x2e\\x5b\\x5c\\x5d\\x7b\\x7d\\x7f\\x3a]{1}[^\\x00-\\x20\\x22\\x23\\x27\\x2c\\x2e\\x5b\\x5c\\x5d\\x7b\\x7d\\x7f\\x3a]*)', 'y'),
+		Id: new RegExp ('([^\\x30-\\x39\\x00-\\x20\\x22\\x23\\x27\\x2b\\x2c\\x2d\\x2e\\x5b\\x5c\\x5d\\x7b\\x7d\\x7f]{1}[^\\x00-\\x20\\x22\\x23\\x27\\x2c\\x2e\\x5b\\x5c\\x5d\\x7b\\x7d\\x7f]*)', 'gy'),
+		ComponentNameId: new RegExp ('([^\\x30-\\x39\\x00-\\x20\\x22\\x23\\x27\\x2b\\x2c\\x2d\\x2e\\x5b\\x5c\\x5d\\x7b\\x7d\\x7f\\x3a]{1}[^\\x00-\\x20\\x22\\x23\\x27\\x2c\\x2e\\x5b\\x5c\\x5d\\x7b\\x7d\\x7f\\x3a]*)', 'gy'),
 
-		initializeOnly: new RegExp ('^initializeOnly', 'y'),
-		inputOnly:      new RegExp ('^inputOnly',      'y'),
-		outputOnly:     new RegExp ('^outputOnly',     'y'),
-		inputOutput:    new RegExp ('^inputOutput',    'y'),
+		initializeOnly: new RegExp ('initializeOnly', 'gy'),
+		inputOnly:      new RegExp ('inputOnly',      'gy'),
+		outputOnly:     new RegExp ('outputOnly',     'gy'),
+		inputOutput:    new RegExp ('inputOutput',    'gy'),
 
-		field:        new RegExp ('^field', 'y'),
-		eventIn:      new RegExp ('^eventIn', 'y'),
-		eventOut:     new RegExp ('^eventOut', 'y'),
-		exposedField: new RegExp ('^exposedField', 'y'),
+		field:        new RegExp ('field', 'gy'),
+		eventIn:      new RegExp ('eventIn', 'gy'),
+		eventOut:     new RegExp ('eventOut', 'gy'),
+		exposedField: new RegExp ('exposedField', 'gy'),
 
-		FieldType: new RegExp ('^(MFBool|MFColorRGBA|MFColor|MFDouble|MFFloat|MFImage|MFInt32|MFMatrix3d|MFMatrix3f|MFMatrix4d|MFMatrix4f|MFNode|MFRotation|MFString|MFTime|MFVec2d|MFVec2f|MFVec3d|MFVec3f|MFVec4d|MFVec4f|SFBool|SFColorRGBA|SFColor|SFDouble|SFFloat|SFImage|SFInt32|SFMatrix3d|SFMatrix3f|SFMatrix4d|SFMatrix4f|SFNode|SFRotation|SFString|SFTime|SFVec2d|SFVec2f|SFVec3d|SFVec3f|SFVec4d|SFVec4f)', 'y'),
+		FieldType: new RegExp ('(MFBool|MFColorRGBA|MFColor|MFDouble|MFFloat|MFImage|MFInt32|MFMatrix3d|MFMatrix3f|MFMatrix4d|MFMatrix4f|MFNode|MFRotation|MFString|MFTime|MFVec2d|MFVec2f|MFVec3d|MFVec3f|MFVec4d|MFVec4f|SFBool|SFColorRGBA|SFColor|SFDouble|SFFloat|SFImage|SFInt32|SFMatrix3d|SFMatrix3f|SFMatrix4d|SFMatrix4f|SFNode|SFRotation|SFString|SFTime|SFVec2d|SFVec2f|SFVec3d|SFVec3f|SFVec4d|SFVec4f)', 'gy'),
 
 		// Values
-		int32:  new RegExp ('^((?:0[xX][\\da-fA-F]+)|(?:[+-]?\\d+))', 'y'),
-		double: new RegExp ('^([+-]?(?:(?:(?:\\d*\\.\\d+)|(?:\\d+(?:\\.)?))(?:[eE][+-]?\\d+)?))', 'y'),
-		string: new RegExp ('^"((?:[^\\\\"]|\\\\\\\\|\\\\\\")*)"', 'y'),
-		
-		Inf:         new RegExp ('^[+]?inf',  'yi'),
-		NegativeInf: new RegExp ('^-inf',     'yi'),
-		NaN:         new RegExp ('^[+-]?nan', 'yi'),
+		int32:  new RegExp ('((?:0[xX][\\da-fA-F]+)|(?:[+-]?\\d+))', 'gy'),
+		double: new RegExp ('([+-]?(?:(?:(?:\\d*\\.\\d+)|(?:\\d+(?:\\.)?))(?:[eE][+-]?\\d+)?))', 'gy'),
+		string: new RegExp ('"((?:[^\\\\"]|\\\\\\\\|\\\\\\")*)"', 'gy'),
+
+		Inf:         new RegExp ('[+]?(?:inf|Infinity)', 'gy'),
+		NegativeInf: new RegExp ('-(?:inf|Infinity)',    'gy'),
+		NaN:         new RegExp ('[+-]?(nan|NaN)',       'gy'),
 
 		// Misc
 		Break: new RegExp ('\\r?\\n', 'g'),
@@ -245,27 +247,20 @@ function ($,
 
 		return false;
 	}
-*/
 
 	for (var key in Grammar)
 		Grammar [key] .parse = parse;
 
-	Object .preventExtensions (Grammar);
-	Object .freeze (Grammar);
-	Object .seal (Grammar);
-
 	/*
 	 *  Parser
 	 */
 
-	function Parser (scene, isXML)
+	function Parser (scene)
 	{
-		this .scene             = scene;
-		this .isXML             = isXML;
-		this .executionContexts = [ ];
+		X3DParser .call (this, scene);
 	}
 
-	Parser .prototype =
+	Parser .prototype = Object .assign (Object .create (X3DParser .prototype),
 	{
 		accessTypes:
 		{
@@ -326,43 +321,26 @@ function ($,
 			this .lineNumber = 1;
 			this .lastIndex  = 0;
 		},
-		getBrowser: function ()
-		{
-			return this .scene .getBrowser ();
-		},
-		getExecutionContext: function ()
+		getInput: function ()
 		{
-			return this .executionContexts [this .executionContexts .length - 1];
-		},
-		pushExecutionContext: function (executionContext)
-		{
-			return this .executionContexts .push (executionContext);
-		},
-		popExecutionContext: function ()
-		{
-			this .executionContexts .pop ();
-		},
-		isInsideProtoDefinition: function ()
-		{
-			return this .executionContexts .length > 1;
-		},
-		addRootNode: function (node)
-		{
-			this .getExecutionContext () .rootNodes .push (node);
+			return this .input;
 		},
 		exception: function (string)
 		{
 			if (this .getBrowser () .isStrict ())
 				throw new Error (string);
 
-			this .getBrowser () .println (string);
+			console .warn (string);
 		},
-		parseIntoScene: function (input)
+		parseIntoScene: function (input, success, error)
 		{
 			try
 			{
-				this .scene .setEncoding ("VRML");
-				this .scene .setProfile (this .getBrowser () .getProfile ("Full"));
+				this .success = success;
+				this .error   = error;
+
+				this .getScene () .setEncoding ("VRML");
+				this .getScene () .setProfile (this .getBrowser () .getProfile ("Full"));
 
 				this .setInput (input);
 				this .x3dScene ();
@@ -370,6 +348,7 @@ function ($,
 			}
 			catch (error)
 			{
+				//console .log (error);
 				throw new Error (this .getError (error));
 			}
 		},
@@ -384,20 +363,20 @@ function ($,
 				line     = this .getLastLine (),
 				lastLine = this .getLastLine (),
 				linePos  = line .length - rest .length + 1;
-	
+
 			if (line .length > 80)
 			{
 				line     = line .substr (linePos - 40, 80);
 				lastLine = "";
 				linePos  = 40;
 			}
-	
+
 			// Format error
 
 			var message = "\n"
 				+ "********************************************************************************" + "\n"
 				+ "Parser error at line " + this .lineNumber + ":" + linePos  + "\n"
-				+ "in '" + this .scene .getURL () + "'" + "\n"
+				+ "in '" + this .getScene () .getWorldURL () + "'" + "\n"
 				+ "\n"
 				+ lastLine + "\n"
 				+ line + "\n"
@@ -458,11 +437,11 @@ function ($,
 			{
 				if (!this .xml)
 					this .lines (this .result [1]);
-				
+
 				return true;
 			}
 
-			return false;	
+			return false;
 		},
 		lines: function (string)
 		{
@@ -473,28 +452,67 @@ function ($,
 		},
 		x3dScene: function ()
 		{
-			this .pushExecutionContext (this .scene);
+			this .pushExecutionContext (this .getScene ());
 
 			this .headerStatement ();
 			this .profileStatement ();
 			this .componentStatements ();
 			this .unitStatements ();
 			this .metaStatements ();
-			this .statements ();
 
-			this .popExecutionContext (this .scene);
+			try
+			{
+				this .setUnits (this .getScene () .getMetaData ("generator"));
+			}
+			catch (error)
+			{ }
 
-			if (this .lastIndex < this .input .length)
-				throw new Error ("Unknown statement.");
+			if (this .success)
+			{
+				require (this .getProviderUrls (),
+				function ()
+				{
+					try
+					{
+						this .statements ();
+						this .popExecutionContext ();
+
+						if (this .lastIndex < this .input .length)
+							throw new Error ("Unknown statement.");
+
+						this .success (this .getScene ());
+					}
+					catch (error)
+					{
+						this .error (new Error (this .getError (error)));
+					}
+				}
+				.bind (this),
+				function (error)
+				{
+					this .error (error);
+				}
+				.bind (this));
+			}
+			else
+			{
+				this .statements ();
+				this .popExecutionContext ();
+
+				if (this .lastIndex < this .input .length)
+					throw new Error ("Unknown statement.");
+			}
 		},
 		headerStatement: function ()
 		{
+			Grammar .Header .lastIndex = 0;
+
 			var result = Grammar .Header .exec (this .input);
 
 			if (result)
 			{
-				this .scene .specificationVersion = result [2];
-				this .scene .encoding             = "VRML";
+				this .getScene () .setSpecificationVersion (result [2]);
+				this .getScene () .setEncoding             ("VRML");
 				return true;
 			}
 
@@ -510,7 +528,7 @@ function ($,
 				{
 					var profile = this .getBrowser () .getProfile (this .result [1]);
 
-					this .scene .setProfile (profile);
+					this .getScene () .setProfile (profile);
 					return;
 				}
 
@@ -523,7 +541,7 @@ function ($,
 
 			while (component)
 			{
-				this .scene .addComponent (component);
+				this .getScene () .addComponent (component);
 
 				component = this .componentStatement ();
 			}
@@ -539,7 +557,7 @@ function ($,
 					var componentNameIdCharacters = this .result [1];
 
 					this .comments ();
-		
+
 					if (Grammar .Colon .parse (this))
 					{
 						if (this .componentSupportLevel ())
@@ -548,16 +566,16 @@ function ($,
 
 							return this .getBrowser () .getComponent (componentNameIdCharacters, componentSupportLevel);
 						}
-		
+
 						throw new Error ("Expected a component support level.");
 					}
-		
+
 					throw new Error ("Expected a ':' after component name.");
 				}
-		
+
 				throw new Error ("Expected a component name.");
 			}
-		
+
 			return null;
 		},
 		componentSupportLevel: function ()
@@ -572,24 +590,24 @@ function ($,
 		unitStatement: function ()
 		{
 			this .comments ();
-		
+
 			if (Grammar .UNIT .parse (this))
 			{
 				if (this .categoryNameId ())
 				{
 					var categoryNameId = this .result [1];
-		
+
 					if (this .unitNameId ())
 					{
 						var unitNameId = this .result [1];
-		
+
 						if (this .unitConversionFactor ())
 						{
 							var unitConversionFactor = this .value;
 
 						   try
 						   {
-								this .scene .updateUnit (categoryNameId, unitNameId, unitConversionFactor);
+								this .getScene () .updateUnit (categoryNameId, unitNameId, unitConversionFactor);
 								return true;
 							}
 							catch (error)
@@ -598,16 +616,16 @@ function ($,
 							   return true;
 							}
 						}
-		
+
 						throw new Error ("Expected unit conversion factor.");
 					}
-		
+
 					throw new Error ("Expected unit name identificator.");
 				}
-		
+
 				throw new Error ("Expected category name identificator after UNIT statement.");
 			}
-		
+
 			return false;
 		},
 		unitConversionFactor: function ()
@@ -628,21 +646,21 @@ function ($,
 				if (this .metakey ())
 				{
 					var metakey = this .value;
-		
+
 					if (this .metavalue ())
 					{
 						var metavalue = this .value;
 
-						this .scene .setMetaData (metakey, metavalue);
+						this .getScene () .setMetaData (metakey, metavalue);
 						return true;
 					}
-		
+
 					throw new Error ("Expected metadata value.");
 				}
-		
+
 				throw new Error ("Expected metadata key.");
 			}
-		
+
 			return false;
 		},
 		metakey: function ()
@@ -664,11 +682,11 @@ function ($,
 					var
 						localNodeNameId    = this .result [1],
 						exportedNodeNameId = "";
-		
+
 					this .comments ();
-		
-					var node = this .scene .getLocalNode (localNodeNameId);
-		
+
+					var node = this .getScene () .getLocalNode (localNodeNameId);
+
 					if (Grammar .AS .parse (this))
 					{
 						if (this .exportedNodeNameId ())
@@ -678,14 +696,14 @@ function ($,
 					}
 					else
 						exportedNodeNameId = localNodeNameId;
-		
-					this .scene .updateExportedNode (exportedNodeNameId, node);
+
+					this .getScene () .updateExportedNode (exportedNodeNameId, node);
 					return true;
 				}
-		
+
 				throw new Error ("No name given after EXPORT.");
 			}
-		
+
 			return false;
 		},
 		importStatement: function ()
@@ -699,9 +717,9 @@ function ($,
 					var
 						inlineNodeNameId = this .result [1],
 						namedNode        = this .getExecutionContext () .getNamedNode (inlineNodeNameId);
-		
+
 					this .comments ();
-	
+
 					if (Grammar .Period .parse (this))
 					{
 						if (this .exportedNodeNameId ())
@@ -709,9 +727,9 @@ function ($,
 							var
 								exportedNodeNameId = this .result [1],
 								nodeNameId         = exportedNodeNameId;
-	
+
 							this .comments ();
-	
+
 							if (Grammar .AS .parse (this))
 							{
 								if (this .nodeNameId ())
@@ -720,17 +738,17 @@ function ($,
 								else
 									throw new Error ("No name given after AS.");
 							}
-	
+
 							this .getExecutionContext () .updateImportedNode (namedNode, exportedNodeNameId, nodeNameId);
 							return true;
 						}
-	
+
 						throw new Error ("Expected exported node name.");
 					}
-	
+
 					throw new Error ("Expected a '.' after exported node name.");
 				}
-		
+
 				throw new Error ("No name given after IMPORT statement.");
 			}
 			return false;
@@ -744,13 +762,13 @@ function ($,
 		{
 			if (this .protoStatement ())
 				return true;
-		
+
 			if (this .routeStatement ())
 				return true;
-		
+
 			if (this .importStatement ())
 				return true;
-		
+
 			if (this .exportStatement ())
 				return true;
 
@@ -793,10 +811,10 @@ function ($,
 		{
 			if (this .proto ())
 				return true;
-		
+
 			if (this .externproto ())
 				return true;
-		
+
 			return false;
 		},
 		protoStatements: function ()
@@ -807,25 +825,25 @@ function ($,
 		proto: function ()
 		{
 			this .comments ();
-		
+
 			if (Grammar .PROTO .parse (this))
 			{
 				if (this .nodeTypeId ())
 				{
 					var nodeTypeId = this .result [1];
-		
+
 					this .comments ();
-		
+
 					if (Grammar .OpenBracket .parse (this))
 					{
 						var interfaceDeclarations = this .interfaceDeclarations ();
-		
+
 						this .comments ();
-		
+
 						if (Grammar .CloseBracket .parse (this))
 						{
 							this .comments ();
-		
+
 							if (Grammar .OpenBrace .parse (this))
 							{
 								var proto = new X3DProtoDeclaration (this .getExecutionContext ());
@@ -837,14 +855,16 @@ function ($,
 									proto .addUserDefinedField (field .getAccessType (), field .getName (), field);
 								}
 
-								this .pushExecutionContext (proto);
-		
+								this .pushPrototype (proto);
+								this .pushExecutionContext (proto .getBody ());
+
 								this .protoBody ();
-		
+
 								this .popExecutionContext ();
-		
+								this .popPrototype ();
+
 								this .comments ();
-		
+
 								if (Grammar .CloseBrace .parse (this))
 								{
 									proto .setName (nodeTypeId);
@@ -853,7 +873,7 @@ function ($,
 									this .getExecutionContext () .protos .add (nodeTypeId, proto);
 									return true;
 								}
-	
+
 								throw new Error ("Expected a '}' at the end of PROTO body.");
 							}
 
@@ -885,7 +905,7 @@ function ($,
 		rootNodeStatement: function ()
 		{
 			this .comments ();
-		
+
 			if (Grammar .DEF .parse (this))
 			{
 				if (this .nodeNameId ())
@@ -899,7 +919,7 @@ function ($,
 
 					throw new Error ("Expected node type name after DEF.");
 				}
-	
+
 				throw new Error ("No name given after DEF.");
 			}
 
@@ -928,38 +948,38 @@ function ($,
 		restrictedInterfaceDeclaration: function ()
 		{
 			this .comments ();
-		
+
 			if (Grammar .inputOnly .parse (this) || Grammar .eventIn .parse (this))
 			{
 				if (this .fieldType ())
 				{
 					var fieldType = this .result [1];
-		
+
 					if (this .inputOnlyId ())
 					{
 						var
 							fieldId = this .result [1],
 							field = new (this [fieldType] .constructor) ();
-						
+
 						field .setAccessType (X3DConstants .inputOnly);
 						field .setName (fieldId);
 						return field;
 					}
-		
+
 					throw new Error ("Expected a name for field.");
 				}
 
 				this .Id ()
-		
+
 				throw new Error ("Unknown event or field type: '" + this .result [1] + "'.");
 			}
-		
+
 			if (Grammar .outputOnly .parse (this) || Grammar .eventOut .parse (this))
 			{
 				if (this .fieldType ())
 				{
 					var fieldType = this .result [1];
-		
+
 					if (this .outputOnlyId ())
 					{
 						var
@@ -970,83 +990,83 @@ function ($,
 						field .setName (fieldId);
 						return field;
 					}
-		
+
 					throw new Error ("Expected a name for field.");
 				}
-		
+
 				this .Id ()
-		
+
 				throw new Error ("Unknown event or field type: '" + this .result [1] + "'.");
 			}
-		
+
 			if (Grammar .initializeOnly .parse (this) || Grammar .field .parse (this))
 			{
 				if (this .fieldType ())
 				{
 					var fieldType = this .result [1];
-		
+
 					if (this .initializeOnlyId ())
 					{
 						var
 							fieldId = this .result [1],
 							field = new (this [fieldType] .constructor) ();
-		
+
 						if (this .fieldValue (field))
 						{
 							field .setAccessType (X3DConstants .initializeOnly);
 							field .setName (fieldId);
 							return field;
 						}
-		
+
 						throw new Error ("Couldn't read value for field '" + fieldId + "'.");
 					}
-		
+
 					throw new Error ("Expected a name for field.");
 				}
-		
+
 				this .Id ()
-		
+
 				throw new Error ("Unknown event or field type: '" + this .result [1] + "'.");
 			}
-		
+
 			return null;
 		},
 		interfaceDeclaration: function ()
 		{
 			var field = this .restrictedInterfaceDeclaration ();
-		
+
 			if (field)
 				return field;
 
 			this .comments ();
-		
+
 			if (Grammar .inputOutput .parse (this) || Grammar .exposedField .parse (this))
 			{
 				if (this .fieldType ())
 				{
 					var fieldType = this .result [1];
-		
+
 					if (this .inputOutputId ())
 					{
 						var
 							fieldId = this .result [1],
 							field   = new (this [fieldType] .constructor) ();
-		
+
 						if (this .fieldValue (field))
 						{
 							field .setAccessType (X3DConstants .inputOutput);
 							field .setName (fieldId);
 							return field;
 						}
-		
+
 						throw new Error ("Couldn't read value for field '" + fieldId + "'.");
 					}
-		
+
 					throw new Error ("Expected a name for field.");
 				}
-	
-				this .Id ()
-		
+
+				this .Id ();
+
 				throw new Error ("Unknown event or field type: '" + this .result [1] + "'.");
 			}
 
@@ -1055,21 +1075,21 @@ function ($,
 		externproto: function ()
 		{
 			this .comments ();
-		
+
 			if (Grammar .EXTERNPROTO .parse (this))
 			{
 				if (this .nodeTypeId ())
 				{
 					var nodeTypeId = this .result [1];
-		
+
 					this .comments ();
-		
+
 					if (Grammar .OpenBracket .parse (this))
 					{
 						var externInterfaceDeclarations = this .externInterfaceDeclarations ();
-		
+
 						this .comments ();
-		
+
 						if (Grammar .CloseBracket .parse (this))
 						{
 							if (this .URLList (this .MFString))
@@ -1082,27 +1102,27 @@ function ($,
 
 									externproto .addUserDefinedField (field .getAccessType (), field .getName (), field);
 								}
-		
+
 								externproto .setName (nodeTypeId);
 								externproto .url_ = this .MFString;
 								externproto .setup ();
 
-								this .getExecutionContext () .externprotos .add (nodeTypeId, externproto);	
+								this .getExecutionContext () .externprotos .add (nodeTypeId, externproto);
 								return true;
 							}
-		
+
 							throw new Error ("Expected a URL list after EXTERNPROTO interface declaration '" + nodeTypeId + "'.");
 						}
-		
+
 						throw new Error ("Expected a ']' at the end of EXTERNPROTO interface declaration.");
 					}
-		
+
 					throw new Error ("Expected a '[' at the beginning of EXTERNPROTO interface declaration.");
 				}
-		
+
 				throw new Error ("Invalid EXTERNPROTO definition name.");
 			}
-		
+
 			return false;
 		},
 		externInterfaceDeclarations: function ()
@@ -1114,7 +1134,7 @@ function ($,
 			while (field)
 			{
 				externInterfaceDeclarations .push (field);
-				
+
 				field = this .externInterfaceDeclaration ();
 			}
 
@@ -1123,38 +1143,38 @@ function ($,
 		externInterfaceDeclaration: function ()
 		{
 			this .comments ();
-		
+
 			if (Grammar .inputOnly .parse (this) || Grammar .eventIn .parse (this))
 			{
 				if (this .fieldType ())
 				{
 					var fieldType = this .result [1];
-		
+
 					if (this .inputOnlyId ())
 					{
 						var
 							fieldId = this .result [1],
 							field = new (this [fieldType] .constructor) ();
-						
+
 						field .setAccessType (X3DConstants .inputOnly);
 						field .setName (fieldId);
 						return field;
 					}
-		
+
 					throw new Error ("Expected a name for field.");
 				}
 
 				this .Id ()
-		
+
 				throw new Error ("Unknown event or field type: '" + this .result [1] + "'.");
 			}
-		
+
 			if (Grammar .outputOnly .parse (this) || Grammar .eventOut .parse (this))
 			{
 				if (this .fieldType ())
 				{
 					var fieldType = this .result [1];
-		
+
 					if (this .outputOnlyId ())
 					{
 						var
@@ -1165,62 +1185,62 @@ function ($,
 						field .setName (fieldId);
 						return field;
 					}
-		
+
 					throw new Error ("Expected a name for field.");
 				}
-		
+
 				this .Id ()
-		
+
 				throw new Error ("Unknown event or field type: '" + this .result [1] + "'.");
 			}
-		
+
 			if (Grammar .initializeOnly .parse (this) || Grammar .field .parse (this))
 			{
 				if (this .fieldType ())
 				{
 					var fieldType = this .result [1];
-		
+
 					if (this .initializeOnlyId ())
 					{
 						var
 							fieldId = this .result [1],
 							field = new (this [fieldType] .constructor) ();
-		
+
 						field .setAccessType (X3DConstants .initializeOnly);
 						field .setName (fieldId);
 						return field;
 					}
-		
+
 					throw new Error ("Expected a name for field.");
 				}
-		
+
 				this .Id ()
-		
+
 				throw new Error ("Unknown event or field type: '" + this .result [1] + "'.");
 			}
-			
+
 			if (Grammar .inputOutput .parse (this) || Grammar .exposedField .parse (this))
 			{
 				if (this .fieldType ())
 				{
 					var fieldType = this .result [1];
-		
+
 					if (this .inputOutputId ())
 					{
 						var
 							fieldId = this .result [1],
 							field   = new (this [fieldType] .constructor) ();
-		
+
 						field .setAccessType (X3DConstants .inputOutput);
 						field .setName (fieldId);
 						return field;
 					}
-	
+
 					throw new Error ("Expected a name for field.");
 				}
-	
+
 				this .Id ()
-		
+
 				throw new Error ("Unknown event or field type: '" + this .result [1] + "'.");
 			}
 
@@ -1233,7 +1253,7 @@ function ($,
 		routeStatement: function ()
 		{
 			this .comments ();
-		
+
 			if (Grammar .ROUTE .parse (this))
 			{
 				if (this .nodeNameId ())
@@ -1243,15 +1263,15 @@ function ($,
 						fromNode   = this .getExecutionContext () .getLocalNode (fromNodeId);
 
 					this .comments ();
-		
+
 					if (Grammar .Period .parse (this))
 					{
 						if (this .outputOnlyId ())
 						{
 							var eventOutId = this .result [1];
-	
+
 							this .comments ();
-		
+
 							if (Grammar .TO .parse (this))
 							{
 								if (this .nodeNameId ())
@@ -1280,52 +1300,46 @@ function ($,
 												return true;
 											}
 										}
-		
+
 										throw new Error ("Bad ROUTE specification: Expected a field name.");
 									}
-		
+
 									throw new Error ("Bad ROUTE specification: Expected a '.' after node name.");
 								}
-		
+
 								throw new Error ("Bad ROUTE specification: Expected a node name.");
 							}
-		
+
 							throw new Error ("Bad ROUTE specification: Expected a 'TO'.");
 						}
-		
+
 						throw new Error ("Bad ROUTE specification: Expected a field name.");
 					}
-		
+
 					throw new Error ("Bad ROUTE specification: Expected a '.' after node name.");
 				}
-		
+
 				throw new Error ("Bad ROUTE specification: Expected a node name.");
 			}
-		
+
 			return false;
 		},
 		node: function (nodeNameId)
 		{
 			if (this .nodeTypeId ())
 			{
-				var nodeTypeId = this .result [1];
-		
-				try
-				{
-					var baseNode = this .getExecutionContext () .createNode (nodeTypeId, false);
-				}
-				catch (error1)
+				var
+					nodeTypeId = this .result [1],
+					baseNode   = this .getExecutionContext () .createNode (nodeTypeId, false);
+
+				if (! baseNode)
 				{
-					try
-					{
-						var baseNode = this .getExecutionContext () .createProto (nodeTypeId, false);
-					}
-					catch (error2)
-					{
-						throw new Error (error1 .message + "\n" + error2 .message);
-					}
+					baseNode = this .getExecutionContext () .createProto (nodeTypeId, false);
+
+					if (! baseNode)
+						throw new Error ("Unknown node type or proto '" + nodeTypeId + "', you probably have insufficient component/profile statements.");
 				}
-		
+
 				if (nodeNameId .length)
 				{
 					try
@@ -1339,31 +1353,33 @@ function ($,
 
 					this .getExecutionContext () .updateNamedNode (nodeNameId, baseNode);
 				}
-		
+
 				this .comments ();
-		
+
 				if (Grammar .OpenBrace .parse (this))
 				{
 					if (baseNode .hasUserDefinedFields ())
 						this .scriptBody (baseNode);
-		
+
 					else
 						this .nodeBody (baseNode);
-		
+
 					this .comments ();
-		
+
 					if (Grammar .CloseBrace .parse (this))
 					{
-						this .getExecutionContext () .addUninitializedNode (baseNode);
+						if (! this .isInsideProtoDefinition ())
+							baseNode .setup ();
+
 						return baseNode;
 					}
-		
+
 					throw new Error ("Expected '}' at the end of node body.");
 				}
-		
+
 				throw new Error ("Expected '{' at the beginning of node body.");
 			}
-		
+
 			return false;
 		},
 		scriptBody: function (baseNode)
@@ -1373,30 +1389,30 @@ function ($,
 		},
 		scriptBodyElement: function (baseNode)
 		{
-//			var
-//				lastIndex  = this .lastIndex,
-//				lineNumber = this .lineNumber;
-
 			var
-				input      = this .input,
+				lastIndex  = this .lastIndex,
 				lineNumber = this .lineNumber;
 
+//			var
+//				input      = this .input,
+//				lineNumber = this .lineNumber;
+
 			if (this .Id ())
 			{
 				var accessType = this .accessTypes [this .result [1]];
-		
+
 				if (accessType)
 				{
 					if (this .fieldType ())
 					{
 						var fieldType = this .result [1];
-		
+
 						if (this .Id ())
 						{
 							var fieldId = this .result [1];
 
 							this .comments ();
-		
+
 							if (Grammar .IS .parse (this))
 							{
 								if (this .isInsideProtoDefinition ())
@@ -1404,20 +1420,20 @@ function ($,
 									if (this .Id ())
 									{
 										var isId = this .result [1];
-		
+
 										try
 										{
-											var reference = this .getExecutionContext () .getField (isId);
+											var reference = this .getPrototype () .getField (isId);
 										}
 										catch (error)
 										{
-											this .exception ("No such event or field '" + isId + "' inside PROTO " + this .getExecutionContext () .getName () + " interface declaration.");
-											
+											this .exception ("No such event or field '" + isId + "' inside PROTO " + this .getPrototype () .getName () + " interface declaration.");
+
 											return true;
 										}
-		
+
 										var supportedField = this [fieldType];
-		
+
 										if (supportedField .getType () === reference .getType ())
 										{
 											if (reference .isReference (accessType))
@@ -1425,44 +1441,30 @@ function ($,
 												try
 												{
 													var field = baseNode .getField (fieldId);
-		
-													if (reference .getType () === field .getType ())
+
+													if (! (accessType === field .getAccessType () && reference .getType () === field .getType ()))
 													{
-														if (accessType === field .getAccessType ())
-															;
-														else if (field .getAccessType () === X3DConstants .inputOutput)
-														{
-															if (accessType !== field .getAccessType ())
-																field = this .createUserDefinedField (baseNode, accessType, fieldId, supportedField);
-														}
-														else
-														{
-															this .exception ("Field '" + fieldId + "' must have access type " + accessTypeToString (field .getAccessType ()) + ".");
-	
-															return true;
-														}
-													}
-													else
 														field = this .createUserDefinedField (baseNode, accessType, fieldId, supportedField);
+													}
 												}
 												catch (error)
 												{
 													var field = this .createUserDefinedField (baseNode, accessType, fieldId, supportedField);
 												}
-		
+
 												field .addReference (reference);
 												return true;
 											}
-		
-											throw new Error ("Field '" + fieldId + "' and '" + reference .getName () + "' in PROTO '" + this .getExecutionContext () .getName () + "' are incompatible as an IS mapping.");
+
+											throw new Error ("Field '" + fieldId + "' and '" + reference .getName () + "' in PROTO '" + this .getPrototype () .getName () + "' are incompatible as an IS mapping.");
 										}
-		
-										throw new Error ("Field '" + fieldId + "' and '" + reference .getName () + "' in PROTO '" + this .getExecutionContext () .getName () + "' have different types.");
+
+										throw new Error ("Field '" + fieldId + "' and '" + reference .getName () + "' in PROTO '" + this .getPrototype () .getName () + "' have different types.");
 									}
-		
+
 									throw new Error ("No name give after IS statement.");
 								}
-		
+
 								throw new Error ("IS statement outside PROTO definition.");
 							}
 						}
@@ -1470,14 +1472,14 @@ function ($,
 				}
 			}
 
-//			this .lastIndex  = lastIndex;
-//			this .lineNumber = lineNumber;
-
-			this .input      = input;
+			this .lastIndex  = lastIndex;
 			this .lineNumber = lineNumber;
 
+//			this .input      = input;
+//			this .lineNumber = lineNumber;
+
 			var field = this .interfaceDeclaration ();
-		
+
 			if (field)
 			{
 				try
@@ -1485,13 +1487,12 @@ function ($,
 					if (field .getAccessType () === X3DConstants .inputOutput)
 					{
 						var existingField = baseNode .getField (field .getName ());
-		
+
 						if (existingField .getAccessType () === X3DConstants .inputOutput)
 						{
 							if (field .getType () === existingField .getType ())
 							{
-								existingField .set (field .getValue ());
-								existingField .setSet (true);
+								existingField .setValue (field);
 								return true;
 							}
 						}
@@ -1503,7 +1504,7 @@ function ($,
 				baseNode .addUserDefinedField (field .getAccessType (), field .getName (), field);
 				return true;
 			}
-		
+
 			return this .nodeBodyElement (baseNode);
 		},
 		createUserDefinedField: function (baseNode, accessType, fieldId, supportedField)
@@ -1523,10 +1524,10 @@ function ($,
 		{
 			if (this .protoStatement ())
 				return true;
-		
+
 			if (this .routeStatement ())
 				return true;
-		
+
 			if (this .Id ())
 			{
 				var fieldId = this .result [1];
@@ -1539,9 +1540,9 @@ function ($,
 				{
 					throw new Error ("Unknown field '" + fieldId + "' in class '" + baseNode .getTypeName () + "'.");
 				}
-		
+
 				this .comments ();
-		
+
 				if (Grammar .IS .parse (this))
 				{
 					if (this .isInsideProtoDefinition ())
@@ -1549,18 +1550,18 @@ function ($,
 						if (this .Id ())
 						{
 							var isId = this .result [1];
-		
+
 							try
 							{
-								var reference = this .getExecutionContext () .getField (isId);
+								var reference = this .getPrototype () .getField (isId);
 							}
 							catch (error)
 							{
-								this .exception ("No such event or field '" + isId + "' inside PROTO " + this .getExecutionContext () .getName ());
-		
+								this .exception ("No such event or field '" + isId + "' inside PROTO " + this .getPrototype () .getName ());
+
 								return true;
 							}
-		
+
 							if (field .getType () === reference .getType ())
 							{
 								if (reference .isReference (field .getAccessType ()))
@@ -1568,19 +1569,19 @@ function ($,
 									field .addReference (reference);
 									return true;
 								}
-		
-								throw new Error ("Field '" + field .getName () + "' and '" + reference .getName () + "' in PROTO " + this .getExecutionContext () . getName () + " are incompatible as an IS mapping.");
+
+								throw new Error ("Field '" + field .getName () + "' and '" + reference .getName () + "' in PROTO " + this .getPrototype () . getName () + " are incompatible as an IS mapping.");
 							}
-		
-							throw new Error ("Field '" + field .getName () + "' and '" + reference .getName () + "' in PROTO " + this .getExecutionContext () .getName () + " have different types.");
+
+							throw new Error ("Field '" + field .getName () + "' and '" + reference .getName () + "' in PROTO " + this .getPrototype () .getName () + " have different types.");
 						}
-		
+
 						throw new Error("No name give after IS statement.");
 					}
-		
+
 					throw new Error ("IS statement outside PROTO definition.");
 				}
-		
+
 				if (field .isInitializable ())
 				{
 					if (this .fieldValue (field))
@@ -1588,10 +1589,10 @@ function ($,
 
 					throw new Error ("Couldn't read value for field '" + fieldId + "'.");
 				}
-		
+
 				throw new Error ("Couldn't assign value to " + accessTypeToString (field .getAccessType ()) + " field '" + fieldId + "'.");
 			}
-		
+
 			return false;
 		},
 		profileNameId: function () { return this .Id (); },
@@ -1624,14 +1625,12 @@ function ($,
 		},
 		fieldValue: function (field)
 		{
-			field .setSet (true);
-
 			return this .fieldTypes [field .getType ()] .call (this, field);
 		},
 		double: function ()
 		{
 			this .comments ();
-			
+
 			if (Grammar .double .parse (this))
 			{
 				this .value = parseFloat (this .result [1]);
@@ -1678,8 +1677,7 @@ function ($,
 			{
 				this .value = Fields .SFString .unescape (this .result [1]);
 
-				if (!this .isXML)
-					this .lines (this .value);
+				this .lines (this .value);
 
 				return true;
 			}
@@ -1690,30 +1688,15 @@ function ($,
 		{
 			this .comments ();
 
-			if (this .isXML)
-			{
-				if (Grammar .true .parse (this))
-				{
-					field .set (true);
-					return true;
-				}
-
-				if (Grammar .false .parse (this))
-				{
-					field .set (false);
-					return true;
-				}
-			}
-
 			if (Grammar .TRUE .parse (this))
 			{
-				field .set (true);
+				field .setValue (true);
 				return true;
 			}
 
 			if (Grammar .FALSE .parse (this))
 			{
-				field .set (false);
+				field .setValue (false);
 				return true;
 			}
 
@@ -1727,7 +1710,7 @@ function ($,
 			{
 				field .push (this .SFBool);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -1746,16 +1729,11 @@ function ($,
 		sfboolValues: function (field)
 		{
 			field .length = 0;
+			field         = field .getTarget ();
 
-			var
-				array = field .getValue (),
-				value = new Fields .SFBool ();
-
-			while (this .sfboolValue (value))
+			while (this .sfboolValue (this .SFBool))
 			{
-				value .addParent (field);
-				array .push (value);
-				value = new Fields .SFBool ();
+				field .push (this .SFBool);
 			}
 		},
 		sfcolorValue: function (field)
@@ -1763,16 +1741,19 @@ function ($,
 			if (this .double ())
 			{
 				var r = this .value;
-				
+
 				if (this .double ())
 				{
 					var g = this .value;
-					
+
 					if (this .double ())
 					{
 						var b = this .value;
 
-						field .getValue () .set (r, g, b);
+						field .r = r;
+						field .g = g;
+						field .b = b;
+
 						return true;
 					}
 				}
@@ -1788,7 +1769,7 @@ function ($,
 			{
 				field .push (this .SFColor);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -1807,16 +1788,11 @@ function ($,
 		sfcolorValues: function (field)
 		{
 			field .length = 0;
+			field         = field .getTarget ();
 
-			var
-				array = field .getValue (),
-				value = new Fields .SFColor ();
-
-			while (this .sfcolorValue (value))
+			while (this .sfcolorValue (this .SFColor))
 			{
-				value .addParent (field);
-				array .push (value);
-				value = new Fields .SFColor ();
+				field .push (this .SFColor);
 			}
 		},
 		sfcolorrgbaValue: function (field)
@@ -1824,11 +1800,11 @@ function ($,
 			if (this .double ())
 			{
 				var r = this .value;
-				
+
 				if (this .double ())
 				{
 					var g = this .value;
-					
+
 					if (this .double ())
 					{
 						var b = this .value;
@@ -1837,7 +1813,11 @@ function ($,
 						{
 							var a = this .value;
 
-							field .getValue () .set (r, g, b, a);
+							field .r = r;
+							field .g = g;
+							field .b = b;
+							field .a = a;
+
 							return true;
 						}
 					}
@@ -1854,7 +1834,7 @@ function ($,
 			{
 				field .push (this .SFColorRGBA);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -1873,23 +1853,18 @@ function ($,
 		sfcolorrgbaValues: function (field)
 		{
 			field .length = 0;
+			field         = field .getTarget ();
 
-			var
-				array = field .getValue (),
-				value = new Fields .SFColorRGBA ();
-
-			while (this .sfcolorrgbaValue (value))
+			while (this .sfcolorrgbaValue (this .SFColorRGBA))
 			{
-				value .addParent (field);
-				array .push (value);
-				value = new Fields .SFColorRGBA ();
+				field .push (this .SFColorRGBA);
 			}
 		},
 		sfdoubleValue: function (field)
 		{
 			if (this .double ())
 			{
-				field .set (this .value);
+				field .setValue (this .fromUnit (field .getUnit (), this .value));
 				return true;
 			}
 
@@ -1899,11 +1874,13 @@ function ($,
 		{
 			field .length = 0;
 
+			this .SFDouble .setUnit (field .getUnit ());
+
 			if (this .sfdoubleValue (this .SFDouble))
 			{
 				field .push (this .SFDouble);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -1922,16 +1899,13 @@ function ($,
 		sfdoubleValues: function (field)
 		{
 			field .length = 0;
+			field         = field .getTarget ();
 
-			var
-				array = field .getValue (),
-				value = new Fields .SFDouble ();
+			this .SFDouble .setUnit (field .getUnit ());
 
-			while (this .sfdoubleValue (value))
+			while (this .sfdoubleValue (this .SFDouble))
 			{
-				value .addParent (field);
-				array .push (value);
-				value = new Fields .SFDouble ();
+				field .push (this .SFDouble);
 			}
 		},
 		sffloatValue: function (field)
@@ -1942,11 +1916,13 @@ function ($,
 		{
 			field .length = 0;
 
+			this .SFFloat .setUnit (field .getUnit ());
+
 			if (this .sffloatValue (this .SFFloat))
 			{
 				field .push (this .SFFloat);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -1965,16 +1941,13 @@ function ($,
 		sffloatValues: function (field)
 		{
 			field .length = 0;
+			field         = field .getTarget ();
 
-			var
-				array = field .getValue (),
-				value = new Fields .SFFloat ();
+			this .SFFloat .setUnit (field .getUnit ());
 
-			while (this .sffloatValue (value))
+			while (this .sffloatValue (this .SFFloat))
 			{
-				value .addParent (field);
-				array .push (value);
-				value = new Fields .SFFloat ();
+				field .push (this .SFFloat);
 			}
 		},
 		sfimageValue: function (field)
@@ -1986,26 +1959,30 @@ function ($,
 				if (this .int32 ())
 				{
 					var height = this .value;
-					
+
 					if (this .int32 ())
 					{
 						var
 							comp  = this .value,
-							array = [ ],
 							size  = width * height;
 
+						field .width  = width;
+						field .height = height;
+						field .comp   = comp;
+
+						var array = field .array;
+
 						for (var i = 0; i < size; ++ i)
 						{
 							if (this .int32 ())
 							{
-								array .push (this .value);
+								array [i] = this .value;
 								continue;
 							}
 
 							return false;
 						}
 
-						field .getValue () .set (width, height, comp, array);
 						return true;
 					}
 				}
@@ -2021,7 +1998,7 @@ function ($,
 			{
 				field .push (this .SFImage);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2040,23 +2017,18 @@ function ($,
 		sfimageValues: function (field)
 		{
 			field .length = 0;
+			field         = field .getTarget ();
 
-			var
-				array = field .getValue (),
-				value = new Fields .SFImage ();
-
-			while (this .sfimageValue (value))
+			while (this .sfimageValue (this .SFImage))
 			{
-				value .addParent (field);
-				array .push (value);
-				value = new Fields .SFImage ();
+				field .push (this .SFImage);
 			}
 		},
 		sfint32Value: function (field)
 		{
 			if (this .int32 ())
 			{
-				field .set (this .value);
+				field .setValue (this .value);
 				return true;
 			}
 
@@ -2070,7 +2042,7 @@ function ($,
 			{
 				field .push (this .SFInt32);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2089,28 +2061,23 @@ function ($,
 		sfint32Values: function (field)
 		{
 			field .length = 0;
+			field         = field .getTarget ();
 
-			var
-				array = field .getValue (),
-				value = new Fields .SFInt32 ();
-
-			while (this .sfint32Value (value))
+			while (this .sfint32Value (this .SFInt32))
 			{
-				value .addParent (field);
-				array .push (value);
-				value = new Fields .SFInt32 ();
+				field .push (this .SFInt32);
 			}
-		},			
+		},
 		sfmatrix3dValue: function (field)
 		{
 			if (this .double ())
 			{
 				var m00 = this .value;
-				
+
 				if (this .double ())
 				{
 					var m01 = this .value;
-					
+
 					if (this .double ())
 					{
 						var m02 = this .value;
@@ -2118,11 +2085,11 @@ function ($,
 							if (this .double ())
 							{
 								var m10 = this .value;
-								
+
 								if (this .double ())
 								{
 									var m11 = this .value;
-									
+
 									if (this .double ())
 									{
 										var m12 = this .value;
@@ -2130,18 +2097,25 @@ function ($,
 										if (this .double ())
 										{
 											var m20 = this .value;
-											
+
 											if (this .double ())
 											{
 												var m21 = this .value;
-												
+
 												if (this .double ())
 												{
 													var m22 = this .value;
 
-													field .getValue () .set (m00, m01, m02,
-													                         m10, m11, m12,
-													                         m20, m21, m22);
+													field [0] = m00;
+													field [1] = m01;
+													field [2] = m02;
+													field [3] = m10;
+													field [4] = m11;
+													field [5] = m12;
+													field [6] = m20;
+													field [7] = m21;
+													field [8] = m22;
+
 													return true;
 											}
 										}
@@ -2151,8 +2125,8 @@ function ($,
 						}
 					}
 				}
-			}								
-							
+			}
+
 			return false;
 		},
 		mfmatrix3dValue: function (field)
@@ -2163,7 +2137,7 @@ function ($,
 			{
 				field .push (this .SFMatrix3d);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2182,16 +2156,11 @@ function ($,
 		sfmatrix3dValues: function (field)
 		{
 			field .length = 0;
+			field         = field .getTarget ();
 
-			var
-				array = field .getValue (),
-				value = new Fields .SFMatrix3d ();
-
-			while (this .sfmatrix3dValue (value))
+			while (this .sfmatrix3dValue (this .SFMatrix3d))
 			{
-				value .addParent (field);
-				array .push (value);
-				value = new Fields .SFMatrix3d ();
+				field .push (this .SFMatrix3d);
 			}
 		},
 		sfmatrix3fValue: function (field)
@@ -2206,7 +2175,7 @@ function ($,
 			{
 				field .push (this .SFMatrix3f);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2225,16 +2194,11 @@ function ($,
 		sfmatrix3fValues: function (field)
 		{
 			field .length = 0;
+			field         = field .getTarget ();
 
-			var
-				array = field .getValue (),
-				value = new Fields .SFMatrix3f ();
-
-			while (this .sfmatrix3fValue (value))
+			while (this .sfmatrix3fValue (this .SFMatrix3f))
 			{
-				value .addParent (field);
-				array .push (value);
-				value = new Fields .SFMatrix3f ();
+				field .push (this .SFMatrix3f);
 			}
 		},
 		sfmatrix4dValue: function (field)
@@ -2242,11 +2206,11 @@ function ($,
 			if (this .double ())
 			{
 				var m00 = this .value;
-				
+
 				if (this .double ())
 				{
 					var m01 = this .value;
-					
+
 					if (this .double ())
 					{
 						var m02 = this .value;
@@ -2258,11 +2222,11 @@ function ($,
 							if (this .double ())
 							{
 								var m10 = this .value;
-								
+
 								if (this .double ())
 								{
 									var m11 = this .value;
-									
+
 									if (this .double ())
 									{
 										var m12 = this .value;
@@ -2274,11 +2238,11 @@ function ($,
 											if (this .double ())
 											{
 												var m20 = this .value;
-												
+
 												if (this .double ())
 												{
 													var m21 = this .value;
-													
+
 													if (this .double ())
 													{
 														var m22 = this .value;
@@ -2290,11 +2254,11 @@ function ($,
 															if (this .double ())
 															{
 																var m30 = this .value;
-																
+
 																if (this .double ())
 																{
 																	var m31 = this .value;
-																	
+
 																	if (this .double ())
 																	{
 																		var m32 = this .value;
@@ -2303,10 +2267,23 @@ function ($,
 																		{
 																			var m33 = this .value;
 
-																			field .getValue () .set (m00, m01, m02, m03,
-																			                         m10, m11, m12, m13,
-																			                         m20, m21, m22, m23,
-																			                         m30, m31, m32, m33);
+																			field [ 0] = m00;
+																			field [ 1] = m01;
+																			field [ 2] = m02;
+																			field [ 3] = m03;
+																			field [ 4] = m10;
+																			field [ 5] = m11;
+																			field [ 6] = m12;
+																			field [ 7] = m13;
+																			field [ 8] = m20;
+																			field [ 9] = m21;
+																			field [10] = m22;
+																			field [11] = m23;
+																			field [12] = m30;
+																			field [13] = m31;
+																			field [14] = m32;
+																			field [15] = m33;
+
 																			return true;
 																		}
 																	}
@@ -2323,8 +2300,8 @@ function ($,
 						}
 					}
 				}
-			}								
-							
+			}
+
 			return false;
 		},
 		mfmatrix4dValue: function (field)
@@ -2335,7 +2312,7 @@ function ($,
 			{
 				field .push (this .SFMatrix4d);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2354,16 +2331,11 @@ function ($,
 		sfmatrix4dValues: function (field)
 		{
 			field .length = 0;
+			field         = field .getTarget ();
 
-			var
-				array = field .getValue (),
-				value = new Fields .SFMatrix4d ();
-
-			while (this .sfmatrix4dValue (value))
+			while (this .sfmatrix4dValue (this .SFMatrix4d))
 			{
-				value .addParent (field);
-				array .push (value);
-				value = new Fields .SFMatrix4d ();
+				field .push (this .SFMatrix4d);
 			}
 		},
 		sfmatrix4fValue: function (field)
@@ -2378,7 +2350,7 @@ function ($,
 			{
 				field .push (this .SFMatrix4f);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2397,16 +2369,11 @@ function ($,
 		sfmatrix4fValues: function (field)
 		{
 			field .length = 0;
+			field         = field .getTarget ();
 
-			var
-				array = field .getValue (),
-				value = new Fields .SFMatrix4f ();
-
-			while (this .sfmatrix4fValue (value))
+			while (this .sfmatrix4fValue (this .SFMatrix4f))
 			{
-				value .addParent (field);
-				array .push (value);
-				value = new Fields .SFMatrix4f ();
+				field .push (this .SFMatrix4f);
 			}
 		},
 		sfnodeValue: function (field)
@@ -2431,7 +2398,7 @@ function ($,
 			{
 				field .push (node);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2450,11 +2417,11 @@ function ($,
 		nodeStatements: function (field)
 		{
 			var node = this .nodeStatement ();
-		
+
 			while (node !== false)
 			{
 				field .push (node);
-				
+
 				node = this .nodeStatement ();
 			}
 		},
@@ -2463,11 +2430,11 @@ function ($,
 			if (this .double ())
 			{
 				var x = this .value;
-				
+
 				if (this .double ())
 				{
 					var y = this .value;
-					
+
 					if (this .double ())
 					{
 						var z = this .value;
@@ -2476,7 +2443,11 @@ function ($,
 						{
 							var angle = this .value;
 
-							field .getValue () .set (x, y, z, angle);
+							field .x     = x;
+							field .y     = y;
+							field .z     = z;
+							field .angle = this .fromUnit ("angle", angle);
+
 							return true;
 						}
 					}
@@ -2493,7 +2464,7 @@ function ($,
 			{
 				field .push (this .SFRotation);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2512,23 +2483,18 @@ function ($,
 		sfrotationValues: function (field)
 		{
 			field .length = 0;
+			field         = field .getTarget ();
 
-			var
-				array = field .getValue (),
-				value = new Fields .SFRotation ();
-
-			while (this .sfrotationValue (value))
+			while (this .sfrotationValue (this .SFRotation))
 			{
-				value .addParent (field);
-				array .push (value);
-				value = new Fields .SFRotation ();
+				field .push (this .SFRotation);
 			}
 		},
 		sfstringValue: function (field)
 		{
 			if (this .string ())
 			{
-				field .set (this .value);
+				field .setValue (this .value);
 				return true;
 			}
 
@@ -2542,7 +2508,7 @@ function ($,
 			{
 				field .push (this .SFString);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2561,16 +2527,11 @@ function ($,
 		sfstringValues: function (field)
 		{
 			field .length = 0;
+			field         = field .getTarget ();
 
-			var
-				array = field .getValue (),
-				value = new Fields .SFString ();
-
-			while (this .sfstringValue (value))
+			while (this .sfstringValue (this .SFString))
 			{
-				value .addParent (field);
-				array .push (value);
-				value = new Fields .SFString ();
+				field .push (this .SFString);
 			}
 		},
 		sftimeValue: function (field)
@@ -2585,7 +2546,7 @@ function ($,
 			{
 				field .push (this .SFTime);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2604,16 +2565,11 @@ function ($,
 		sftimeValues: function (field)
 		{
 			field .length = 0;
+			field         = field .getTarget ();
 
-			var
-				array = field .getValue (),
-				value = new Fields .SFTime ();
-
-			while (this .sftimeValue (value))
+			while (this .sftimeValue (this .SFTime))
 			{
-				value .addParent (field);
-				array .push (value);
-				value = new Fields .SFTime ();
+				field .push (this .SFTime);
 			}
 		},
 		sfvec2dValue: function (field)
@@ -2621,12 +2577,16 @@ function ($,
 			if (this .double ())
 			{
 				var x = this .value;
-				
+
 				if (this .double ())
 				{
-					var y = this .value;
-					
-					field .getValue () .set (x, y);
+					var
+						y        = this .value,
+						category = field .getUnit ();
+
+					field .x = this .fromUnit (category, x);
+					field .y = this .fromUnit (category, y);
+
 					return true;
 				}
 			}
@@ -2637,11 +2597,13 @@ function ($,
 		{
 			field .length = 0;
 
+			this .SFVec2d .setUnit (field .getUnit ());
+
 			if (this .sfvec2dValue (this .SFVec2d))
 			{
 				field .push (this .SFVec2d);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2660,16 +2622,13 @@ function ($,
 		sfvec2dValues: function (field)
 		{
 			field .length = 0;
+			field         = field .getTarget ();
 
-			var
-				array = field .getValue (),
-				value = new Fields .SFVec2d ();
+			this .SFVec2d .setUnit (field .getUnit ());
 
-			while (this .sfvec2dValue (value))
+			while (this .sfvec2dValue (this .SFVec2d))
 			{
-				value .addParent (field);
-				array .push (value);
-				value = new Fields .SFVec2d ();
+				field .push (this .SFVec2d);
 			}
 		},
 		sfvec2fValue: function (field)
@@ -2680,11 +2639,13 @@ function ($,
 		{
 			field .length = 0;
 
+			this .SFVec2f .setUnit (field .getUnit ());
+
 			if (this .sfvec2fValue (this .SFVec2f))
 			{
 				field .push (this .SFVec2f);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2703,16 +2664,13 @@ function ($,
 		sfvec2fValues: function (field)
 		{
 			field .length = 0;
+			field         = field .getTarget ();
 
-			var
-				array = field .getValue (),
-				value = new Fields .SFVec2f ();
+			this .SFVec2f .setUnit (field .getUnit ());
 
-			while (this .sfvec2fValue (value))
+			while (this .sfvec2fValue (this .SFVec2f))
 			{
-				value .addParent (field);
-				array .push (value);
-				value = new Fields .SFVec2f ();
+				field .push (this .SFVec2f);
 			}
 		},
 		sfvec3dValue: function (field)
@@ -2720,16 +2678,21 @@ function ($,
 			if (this .double ())
 			{
 				var x = this .value;
-				
+
 				if (this .double ())
 				{
 					var y = this .value;
-					
+
 					if (this .double ())
 					{
-						var z = this .value;
+						var
+							z        = this .value,
+							category = field .getUnit ();
+
+						field .x = this .fromUnit (category, x);
+						field .y = this .fromUnit (category, y);
+						field .z = this .fromUnit (category, z);
 
-						field .getValue () .set (x, y, z);
 						return true;
 					}
 				}
@@ -2741,11 +2704,13 @@ function ($,
 		{
 			field .length = 0;
 
+			this .SFVec3d .setUnit (field .getUnit ());
+
 			if (this .sfvec3dValue (this .SFVec3d))
 			{
 				field .push (this .SFVec3d);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2764,16 +2729,13 @@ function ($,
 		sfvec3dValues: function (field)
 		{
 			field .length = 0;
+			field         = field .getTarget ();
 
-			var
-				array = field .getValue (),
-				value = new Fields .SFVec3d ();
+			this .SFVec3d .setUnit (field .getUnit ());
 
-			while (this .sfvec3dValue (value))
+			while (this .sfvec3dValue (this .SFVec3d))
 			{
-				value .addParent (field);
-				array .push (value);
-				value = new Fields .SFVec3d ();
+				field .push (this .SFVec3d);
 			}
 		},
 		sfvec3fValue: function (field)
@@ -2784,11 +2746,13 @@ function ($,
 		{
 			field .length = 0;
 
+			this .SFVec3f .setUnit (field .getUnit ());
+
 			if (this .sfvec3fValue (this .SFVec3f))
 			{
 				field .push (this .SFVec3f);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2807,16 +2771,13 @@ function ($,
 		sfvec3fValues: function (field)
 		{
 			field .length = 0;
+			field         = field .getTarget ();
 
-			var
-				array = field .getValue (),
-				value = new Fields .SFVec3f ();
+			this .SFVec3f .setUnit (field .getUnit ());
 
-			while (this .sfvec3fValue (value))
+			while (this .sfvec3fValue (this .SFVec3f))
 			{
-				value .addParent (field);
-				array .push (value);
-				value = new Fields .SFVec3f ();
+				field .push (this .SFVec3f);
 			}
 		},
 		sfvec4dValue: function (field)
@@ -2824,20 +2785,26 @@ function ($,
 			if (this .double ())
 			{
 				var x = this .value;
-				
+
 				if (this .double ())
 				{
 					var y = this .value;
-					
+
 					if (this .double ())
 					{
 						var z = this .value;
 
 						if (this .double ())
 						{
-							var w = this .value;
+							var
+								w        = this .value,
+								category = field .getUnit ();
+
+							field .x = this .fromUnit (category, x);
+							field .y = this .fromUnit (category, y);
+							field .z = this .fromUnit (category, z);
+							field .w = this .fromUnit (category, w);
 
-							field .getValue () .set (x, y, z, w);
 							return true;
 						}
 					}
@@ -2850,11 +2817,13 @@ function ($,
 		{
 			field .length = 0;
 
+			this .SFVec4d .setUnit (field .getUnit ());
+
 			if (this .sfvec4dValue (this .SFVec4d))
 			{
 				field .push (this .SFVec4d);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2873,16 +2842,13 @@ function ($,
 		sfvec4dValues: function (field)
 		{
 			field .length = 0;
+			field         = field .getTarget ();
 
-			var
-				array = field .getValue (),
-				value = new Fields .SFVec4d ();
+			this .SFVec4d .setUnit (field .getUnit ());
 
-			while (this .sfvec4dValue (value))
+			while (this .sfvec4dValue (this .SFVec4d))
 			{
-				value .addParent (field);
-				array .push (value);
-				value = new Fields .SFVec4d ();
+				field .push (this .SFVec4d);
 			}
 		},
 		sfvec4fValue: function (field)
@@ -2893,11 +2859,13 @@ function ($,
 		{
 			field .length = 0;
 
+			this .SFVec4f .setUnit (field .getUnit ());
+
 			if (this .sfvec4fValue (this .SFVec4f))
 			{
 				field .push (this .SFVec4f);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2916,19 +2884,16 @@ function ($,
 		sfvec4fValues: function (field)
 		{
 			field .length = 0;
+			field         = field .getTarget ();
 
-			var
-				array = field .getValue (),
-				value = new Fields .SFVec4f ();
+			this .SFVec4f .setUnit (field .getUnit ());
 
-			while (this .sfvec4fValue (value))
+			while (this .sfvec4fValue (this .SFVec4f))
 			{
-				value .addParent (field);
-				array .push (value);
-				value = new Fields .SFVec4f ();
+				field .push (this .SFVec4f);
 			}
 		},
-	};
+	});
 
 	Parser .prototype .fieldTypes = [ ];
 	Parser .prototype .fieldTypes [X3DConstants .SFBool]      = Parser .prototype .sfboolValue;
@@ -2938,8 +2903,8 @@ function ($,
 	Parser .prototype .fieldTypes [X3DConstants .SFFloat]     = Parser .prototype .sffloatValue;
 	Parser .prototype .fieldTypes [X3DConstants .SFImage]     = Parser .prototype .sfimageValue;
 	Parser .prototype .fieldTypes [X3DConstants .SFInt32]     = Parser .prototype .sfint32Value;
-	Parser .prototype .fieldTypes [X3DConstants .SFMatrix3f]  = Parser .prototype .sfmatrix4dValue;
-	Parser .prototype .fieldTypes [X3DConstants .SFMatrix3d]  = Parser .prototype .sfmatrix4fValue;
+	Parser .prototype .fieldTypes [X3DConstants .SFMatrix3f]  = Parser .prototype .sfmatrix3dValue;
+	Parser .prototype .fieldTypes [X3DConstants .SFMatrix3d]  = Parser .prototype .sfmatrix3fValue;
 	Parser .prototype .fieldTypes [X3DConstants .SFMatrix4f]  = Parser .prototype .sfmatrix4dValue;
 	Parser .prototype .fieldTypes [X3DConstants .SFMatrix4d]  = Parser .prototype .sfmatrix4fValue;
 	Parser .prototype .fieldTypes [X3DConstants .SFNode]      = Parser .prototype .sfnodeValue;