x_ite 4.2.17 → 4.7.7

package/src/x_ite/Parser/Parser.js

@@ -176,7 +176,7 @@ function (Fields,
 		Comment:     new RegExp ('#(.*?)(?=[\\n\\r])',   'gy'),
 
 		// Header
-		Header:	    new RegExp ("^#(VRML|X3D) V(.*?) (utf8)(?: (.*?))?[\\n\\r]", 'gy'),
+		Header:	    new RegExp ("^#(VRML|X3D) V(.*?) (utf8)(?:[ \\t]+(.*?))?[ \\t]*[\\n\\r]", 'gy'),
 
 		// Keywords
 		AS:          new RegExp ('AS',          'gy'),
@@ -251,10 +251,6 @@ function (Fields,
 	for (var key in Grammar)
 		Grammar [key] .parse = parse;
 
-	Object .preventExtensions (Grammar);
-	Object .freeze (Grammar);
-	Object .seal (Grammar);
-
 	/*
 	 *  Parser
 	 */
@@ -334,7 +330,7 @@ function (Fields,
 			if (this .getBrowser () .isStrict ())
 				throw new Error (string);
 
-			this .getBrowser () .println (string);
+			console .warn (string);
 		},
 		parseIntoScene: function (input, success, error)
 		{
@@ -367,20 +363,20 @@ function (Fields,
 				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 .getScene () .getURL () + "'" + "\n"
+				+ "in '" + this .getScene () .getWorldURL () + "'" + "\n"
 				+ "\n"
 				+ lastLine + "\n"
 				+ line + "\n"
@@ -441,11 +437,11 @@ function (Fields,
 			{
 				if (!this .xml)
 					this .lines (this .result [1]);
-				
+
 				return true;
 			}
 
-			return false;	
+			return false;
 		},
 		lines: function (string)
 		{
@@ -479,12 +475,12 @@ function (Fields,
 					try
 					{
 						this .statements ();
-						this .popExecutionContext (this .getScene ());
+						this .popExecutionContext ();
 
 						if (this .lastIndex < this .input .length)
 							throw new Error ("Unknown statement.");
 
-						this .success ();
+						this .success (this .getScene ());
 					}
 					catch (error)
 					{
@@ -501,8 +497,8 @@ function (Fields,
 			else
 			{
 				this .statements ();
-				this .popExecutionContext (this .getScene ());
-	
+				this .popExecutionContext ();
+
 				if (this .lastIndex < this .input .length)
 					throw new Error ("Unknown statement.");
 			}
@@ -515,8 +511,8 @@ function (Fields,
 
 			if (result)
 			{
-				this .getScene () .specificationVersion = result [2];
-				this .getScene () .encoding             = "VRML";
+				this .getScene () .setSpecificationVersion (result [2]);
+				this .getScene () .setEncoding             ("VRML");
 				return true;
 			}
 
@@ -561,7 +557,7 @@ function (Fields,
 					var componentNameIdCharacters = this .result [1];
 
 					this .comments ();
-		
+
 					if (Grammar .Colon .parse (this))
 					{
 						if (this .componentSupportLevel ())
@@ -570,16 +566,16 @@ function (Fields,
 
 							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 ()
@@ -594,17 +590,17 @@ function (Fields,
 		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;
@@ -620,16 +616,16 @@ function (Fields,
 							   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 ()
@@ -650,7 +646,7 @@ function (Fields,
 				if (this .metakey ())
 				{
 					var metakey = this .value;
-		
+
 					if (this .metavalue ())
 					{
 						var metavalue = this .value;
@@ -658,13 +654,13 @@ function (Fields,
 						this .getScene () .setMetaData (metakey, metavalue);
 						return true;
 					}
-		
+
 					throw new Error ("Expected metadata value.");
 				}
-		
+
 				throw new Error ("Expected metadata key.");
 			}
-		
+
 			return false;
 		},
 		metakey: function ()
@@ -686,11 +682,11 @@ function (Fields,
 					var
 						localNodeNameId    = this .result [1],
 						exportedNodeNameId = "";
-		
+
 					this .comments ();
-		
+
 					var node = this .getScene () .getLocalNode (localNodeNameId);
-		
+
 					if (Grammar .AS .parse (this))
 					{
 						if (this .exportedNodeNameId ())
@@ -700,14 +696,14 @@ function (Fields,
 					}
 					else
 						exportedNodeNameId = localNodeNameId;
-		
+
 					this .getScene () .updateExportedNode (exportedNodeNameId, node);
 					return true;
 				}
-		
+
 				throw new Error ("No name given after EXPORT.");
 			}
-		
+
 			return false;
 		},
 		importStatement: function ()
@@ -721,9 +717,9 @@ function (Fields,
 					var
 						inlineNodeNameId = this .result [1],
 						namedNode        = this .getExecutionContext () .getNamedNode (inlineNodeNameId);
-		
+
 					this .comments ();
-	
+
 					if (Grammar .Period .parse (this))
 					{
 						if (this .exportedNodeNameId ())
@@ -731,9 +727,9 @@ function (Fields,
 							var
 								exportedNodeNameId = this .result [1],
 								nodeNameId         = exportedNodeNameId;
-	
+
 							this .comments ();
-	
+
 							if (Grammar .AS .parse (this))
 							{
 								if (this .nodeNameId ())
@@ -742,17 +738,17 @@ function (Fields,
 								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;
@@ -766,13 +762,13 @@ function (Fields,
 		{
 			if (this .protoStatement ())
 				return true;
-		
+
 			if (this .routeStatement ())
 				return true;
-		
+
 			if (this .importStatement ())
 				return true;
-		
+
 			if (this .exportStatement ())
 				return true;
 
@@ -815,10 +811,10 @@ function (Fields,
 		{
 			if (this .proto ())
 				return true;
-		
+
 			if (this .externproto ())
 				return true;
-		
+
 			return false;
 		},
 		protoStatements: function ()
@@ -829,25 +825,25 @@ function (Fields,
 		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 ());
@@ -859,14 +855,16 @@ function (Fields,
 									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);
@@ -875,7 +873,7 @@ function (Fields,
 									this .getExecutionContext () .protos .add (nodeTypeId, proto);
 									return true;
 								}
-	
+
 								throw new Error ("Expected a '}' at the end of PROTO body.");
 							}
 
@@ -907,7 +905,7 @@ function (Fields,
 		rootNodeStatement: function ()
 		{
 			this .comments ();
-		
+
 			if (Grammar .DEF .parse (this))
 			{
 				if (this .nodeNameId ())
@@ -921,7 +919,7 @@ function (Fields,
 
 					throw new Error ("Expected node type name after DEF.");
 				}
-	
+
 				throw new Error ("No name given after DEF.");
 			}
 
@@ -950,38 +948,38 @@ function (Fields,
 		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
@@ -992,83 +990,83 @@ function (Fields,
 						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 ();
-		
+
 				throw new Error ("Unknown event or field type: '" + this .result [1] + "'.");
 			}
 
@@ -1077,21 +1075,21 @@ function (Fields,
 		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))
@@ -1104,27 +1102,27 @@ function (Fields,
 
 									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 ()
@@ -1136,7 +1134,7 @@ function (Fields,
 			while (field)
 			{
 				externInterfaceDeclarations .push (field);
-				
+
 				field = this .externInterfaceDeclaration ();
 			}
 
@@ -1145,38 +1143,38 @@ function (Fields,
 		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
@@ -1187,62 +1185,62 @@ function (Fields,
 						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] + "'.");
 			}
 
@@ -1255,7 +1253,7 @@ function (Fields,
 		routeStatement: function ()
 		{
 			this .comments ();
-		
+
 			if (Grammar .ROUTE .parse (this))
 			{
 				if (this .nodeNameId ())
@@ -1265,15 +1263,15 @@ function (Fields,
 						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 ())
@@ -1302,52 +1300,46 @@ function (Fields,
 												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
@@ -1361,31 +1353,33 @@ function (Fields,
 
 					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)
@@ -1406,19 +1400,19 @@ function (Fields,
 			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 ())
@@ -1426,20 +1420,20 @@ function (Fields,
 									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))
@@ -1447,44 +1441,30 @@ function (Fields,
 												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.");
 							}
 						}
@@ -1499,7 +1479,7 @@ function (Fields,
 //			this .lineNumber = lineNumber;
 
 			var field = this .interfaceDeclaration ();
-		
+
 			if (field)
 			{
 				try
@@ -1507,13 +1487,12 @@ function (Fields,
 					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;
 							}
 						}
@@ -1525,7 +1504,7 @@ function (Fields,
 				baseNode .addUserDefinedField (field .getAccessType (), field .getName (), field);
 				return true;
 			}
-		
+
 			return this .nodeBodyElement (baseNode);
 		},
 		createUserDefinedField: function (baseNode, accessType, fieldId, supportedField)
@@ -1545,10 +1524,10 @@ function (Fields,
 		{
 			if (this .protoStatement ())
 				return true;
-		
+
 			if (this .routeStatement ())
 				return true;
-		
+
 			if (this .Id ())
 			{
 				var fieldId = this .result [1];
@@ -1561,9 +1540,9 @@ function (Fields,
 				{
 					throw new Error ("Unknown field '" + fieldId + "' in class '" + baseNode .getTypeName () + "'.");
 				}
-		
+
 				this .comments ();
-		
+
 				if (Grammar .IS .parse (this))
 				{
 					if (this .isInsideProtoDefinition ())
@@ -1571,18 +1550,18 @@ function (Fields,
 						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 ()))
@@ -1590,19 +1569,19 @@ function (Fields,
 									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))
@@ -1610,10 +1589,10 @@ function (Fields,
 
 					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 (); },
@@ -1646,14 +1625,12 @@ function (Fields,
 		},
 		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]);
@@ -1713,13 +1690,13 @@ function (Fields,
 
 			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;
 			}
 
@@ -1733,7 +1710,7 @@ function (Fields,
 			{
 				field .push (this .SFBool);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -1764,16 +1741,19 @@ function (Fields,
 			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;
 					}
 				}
@@ -1789,7 +1769,7 @@ function (Fields,
 			{
 				field .push (this .SFColor);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -1820,11 +1800,11 @@ function (Fields,
 			if (this .double ())
 			{
 				var r = this .value;
-				
+
 				if (this .double ())
 				{
 					var g = this .value;
-					
+
 					if (this .double ())
 					{
 						var b = this .value;
@@ -1833,7 +1813,11 @@ function (Fields,
 						{
 							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;
 						}
 					}
@@ -1850,7 +1834,7 @@ function (Fields,
 			{
 				field .push (this .SFColorRGBA);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -1880,7 +1864,7 @@ function (Fields,
 		{
 			if (this .double ())
 			{
-				field .set (this .fromUnit (field .getUnit (), this .value));
+				field .setValue (this .fromUnit (field .getUnit (), this .value));
 				return true;
 			}
 
@@ -1896,7 +1880,7 @@ function (Fields,
 			{
 				field .push (this .SFDouble);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -1938,7 +1922,7 @@ function (Fields,
 			{
 				field .push (this .SFFloat);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -1975,7 +1959,7 @@ function (Fields,
 				if (this .int32 ())
 				{
 					var height = this .value;
-					
+
 					if (this .int32 ())
 					{
 						var
@@ -2014,7 +1998,7 @@ function (Fields,
 			{
 				field .push (this .SFImage);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2044,7 +2028,7 @@ function (Fields,
 		{
 			if (this .int32 ())
 			{
-				field .set (this .value);
+				field .setValue (this .value);
 				return true;
 			}
 
@@ -2058,7 +2042,7 @@ function (Fields,
 			{
 				field .push (this .SFInt32);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2083,17 +2067,17 @@ function (Fields,
 			{
 				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;
@@ -2101,11 +2085,11 @@ function (Fields,
 							if (this .double ())
 							{
 								var m10 = this .value;
-								
+
 								if (this .double ())
 								{
 									var m11 = this .value;
-									
+
 									if (this .double ())
 									{
 										var m12 = this .value;
@@ -2113,18 +2097,25 @@ function (Fields,
 										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;
 											}
 										}
@@ -2134,8 +2125,8 @@ function (Fields,
 						}
 					}
 				}
-			}								
-							
+			}
+
 			return false;
 		},
 		mfmatrix3dValue: function (field)
@@ -2146,7 +2137,7 @@ function (Fields,
 			{
 				field .push (this .SFMatrix3d);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2184,7 +2175,7 @@ function (Fields,
 			{
 				field .push (this .SFMatrix3f);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2215,11 +2206,11 @@ function (Fields,
 			if (this .double ())
 			{
 				var m00 = this .value;
-				
+
 				if (this .double ())
 				{
 					var m01 = this .value;
-					
+
 					if (this .double ())
 					{
 						var m02 = this .value;
@@ -2231,11 +2222,11 @@ function (Fields,
 							if (this .double ())
 							{
 								var m10 = this .value;
-								
+
 								if (this .double ())
 								{
 									var m11 = this .value;
-									
+
 									if (this .double ())
 									{
 										var m12 = this .value;
@@ -2247,11 +2238,11 @@ function (Fields,
 											if (this .double ())
 											{
 												var m20 = this .value;
-												
+
 												if (this .double ())
 												{
 													var m21 = this .value;
-													
+
 													if (this .double ())
 													{
 														var m22 = this .value;
@@ -2263,11 +2254,11 @@ function (Fields,
 															if (this .double ())
 															{
 																var m30 = this .value;
-																
+
 																if (this .double ())
 																{
 																	var m31 = this .value;
-																	
+
 																	if (this .double ())
 																	{
 																		var m32 = this .value;
@@ -2276,10 +2267,23 @@ function (Fields,
 																		{
 																			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;
 																		}
 																	}
@@ -2296,8 +2300,8 @@ function (Fields,
 						}
 					}
 				}
-			}								
-							
+			}
+
 			return false;
 		},
 		mfmatrix4dValue: function (field)
@@ -2308,7 +2312,7 @@ function (Fields,
 			{
 				field .push (this .SFMatrix4d);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2346,7 +2350,7 @@ function (Fields,
 			{
 				field .push (this .SFMatrix4f);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2394,7 +2398,7 @@ function (Fields,
 			{
 				field .push (node);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2413,11 +2417,11 @@ function (Fields,
 		nodeStatements: function (field)
 		{
 			var node = this .nodeStatement ();
-		
+
 			while (node !== false)
 			{
 				field .push (node);
-				
+
 				node = this .nodeStatement ();
 			}
 		},
@@ -2426,11 +2430,11 @@ function (Fields,
 			if (this .double ())
 			{
 				var x = this .value;
-				
+
 				if (this .double ())
 				{
 					var y = this .value;
-					
+
 					if (this .double ())
 					{
 						var z = this .value;
@@ -2439,7 +2443,11 @@ function (Fields,
 						{
 							var angle = this .value;
 
-							field .getValue () .set (x, y, z, this .fromUnit ("angle", angle));
+							field .x     = x;
+							field .y     = y;
+							field .z     = z;
+							field .angle = this .fromUnit ("angle", angle);
+
 							return true;
 						}
 					}
@@ -2456,7 +2464,7 @@ function (Fields,
 			{
 				field .push (this .SFRotation);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2486,7 +2494,7 @@ function (Fields,
 		{
 			if (this .string ())
 			{
-				field .set (this .value);
+				field .setValue (this .value);
 				return true;
 			}
 
@@ -2500,7 +2508,7 @@ function (Fields,
 			{
 				field .push (this .SFString);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2538,7 +2546,7 @@ function (Fields,
 			{
 				field .push (this .SFTime);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2569,15 +2577,16 @@ function (Fields,
 			if (this .double ())
 			{
 				var x = this .value;
-				
+
 				if (this .double ())
 				{
 					var
 						y        = this .value,
 						category = field .getUnit ();
 
-					field .getValue () .set (this .fromUnit (category, x),
-					                         this .fromUnit (category, y));
+					field .x = this .fromUnit (category, x);
+					field .y = this .fromUnit (category, y);
+
 					return true;
 				}
 			}
@@ -2594,7 +2603,7 @@ function (Fields,
 			{
 				field .push (this .SFVec2d);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2636,7 +2645,7 @@ function (Fields,
 			{
 				field .push (this .SFVec2f);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2669,20 +2678,21 @@ function (Fields,
 			if (this .double ())
 			{
 				var x = this .value;
-				
+
 				if (this .double ())
 				{
 					var y = this .value;
-					
+
 					if (this .double ())
 					{
 						var
 							z        = this .value,
 							category = field .getUnit ();
 
-						field .getValue () .set (this .fromUnit (category, x),
-						                         this .fromUnit (category, y),
-						                         this .fromUnit (category, z));
+						field .x = this .fromUnit (category, x);
+						field .y = this .fromUnit (category, y);
+						field .z = this .fromUnit (category, z);
+
 						return true;
 					}
 				}
@@ -2700,7 +2710,7 @@ function (Fields,
 			{
 				field .push (this .SFVec3d);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2742,7 +2752,7 @@ function (Fields,
 			{
 				field .push (this .SFVec3f);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2775,11 +2785,11 @@ function (Fields,
 			if (this .double ())
 			{
 				var x = this .value;
-				
+
 				if (this .double ())
 				{
 					var y = this .value;
-					
+
 					if (this .double ())
 					{
 						var z = this .value;
@@ -2790,10 +2800,11 @@ function (Fields,
 								w        = this .value,
 								category = field .getUnit ();
 
-							field .getValue () .set (this .fromUnit (category, x),
-							                         this .fromUnit (category, y),
-							                         this .fromUnit (category, z),
-							                         this .fromUnit (category, w));
+							field .x = this .fromUnit (category, x);
+							field .y = this .fromUnit (category, y);
+							field .z = this .fromUnit (category, z);
+							field .w = this .fromUnit (category, w);
+
 							return true;
 						}
 					}
@@ -2812,7 +2823,7 @@ function (Fields,
 			{
 				field .push (this .SFVec4d);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2854,7 +2865,7 @@ function (Fields,
 			{
 				field .push (this .SFVec4f);
 				return true;
-			}			
+			}
 
 			if (Grammar .OpenBracket .parse (this))
 			{
@@ -2892,8 +2903,8 @@ function (Fields,
 	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;