CVS: data/Aircraft/SenecaII/Nasal electric.nas, 1.5, 1.6

Update of /var/cvs/FlightGear-0.9/data/Aircraft/SenecaII/Nasal
In directory baron.flightgear.org:/tmp/cvs-serv31949

Modified Files:
	electric.nas 
Log Message:
- added some missing 'var'
- don't crash on unknown element types

Index: electric.nas
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/SenecaII/Nasal/electric.nas,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- electric.nas	18 Mar 2010 07:47:10 -0000	1.5
+++ electric.nas	29 Mar 2010 15:23:38 -0000	1.6
@@ -33,7 +33,7 @@
 
 BaseElement.insert = func(vector, object, position = 0) {
   setsize( vector, size(vector) + 1 );
-  for( i = size(vector)-1; i > position; i = i - 1 ) {
+  for( var i = size(vector)-1; i > position; i = i - 1 ) {
     vector[i] = vector[i-1];
   }
   vector[position] = object;
@@ -47,7 +47,7 @@
   if( x >= pairs[n][0] ) {
     return pairs[n][0];
   }
-  for( i = 0; i < n; i = i + 1 ) {
+  for( var i = 0; i < n; i = i + 1 ) {
     if( x > pairs[i][0] and x <= pairs[i+1][0] ) {
       var x1 = pairs[i][0];
       var x2 = pairs[i+1][0];
@@ -328,17 +328,18 @@
   obj.iNode = obj.node.getNode( "i-ampere", "true" );
 
   var elementNodes = obj.node.getChildren( "element" );
-  for( i = 0; i < size(elementNodes); i = i + 1 ) {
-    append( obj.elements, obj.createElement(elementNodes[i], i) );
+  foreach( var elementNode; elementNodes ) {
+    var element = obj.createElement(elementNode);
+    if( element != nil )
+      append( obj.elements, element );
   }
   return obj;
 }
 
-Bus.createElement= func(n,idx) {
+Bus.createElement= func(n) {
   var node = n;
-  var idx = idx;
 
-  var type = node.getNode("type").getValue();
+  var type = node.getNode("type",1).getValue();
 
   if( type == "battery" ) {
     return BatteryElement.new( node );
@@ -353,7 +354,7 @@
     return LoadElement.new( node );
   } 
 
-  print("unknown element type " ~ type );
+  print("unknown element type ", type == nil ? "<nil>" : type );
   return nil;
 }
 
@@ -411,7 +412,7 @@
   obj.electricSystemNode = props.globals.getNode( n );
 
   var busNodes = obj.electricSystemNode.getChildren( "bus" );
-  for( i = 0; i < size(busNodes); i = i + 1 ) {
+  for( var i = 0; i < size(busNodes); i = i + 1 ) {
     append( obj.bus, Bus.new( busNodes[i], i ));
   }
 


------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev