Merge branch 'master' of https://github.com/pascalabcnet/pascalabcnet …

…into test

Configuration/GlobalAssemblyInfo.cs

@@ -15,7 +15,7 @@ internal static class RevisionClass
 	public const string Major = "3";
 	public const string Minor = "10";
 	public const string Build = "0";
-	public const string Revision = "3551";
+	public const string Revision = "3552";
 
         public const string MainVersion = Major + "." + Minor;
 	public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

Configuration/Version.defs

@@ -1,4 +1,4 @@
-%MINOR%=10
-%REVISION%=3551
 %COREVERSION%=0
+%REVISION%=3552
+%MINOR%=10
 %MAJOR%=3

Release/pabcversion.txt

@@ -1 +1 @@
-3.10.0.3551
+3.10.0.3552

ReleaseGenerators/PascalABCNET_version.nsh

@@ -1 +1 @@
-!define VERSION '3.10.0.3551'
+!define VERSION '3.10.0.3552'

SyntaxTree/tree/AbstractVisitor.cs

@@ -1322,6 +1322,16 @@ public virtual void visit(to_expr _to_expr)
 		{
 			DefaultVisit(_to_expr);
 		}
+
+		public virtual void visit(global_statement _global_statement)
+		{
+			DefaultVisit(_global_statement);
+		}
+
+		public virtual void visit(list_generator _list_generator)
+		{
+			DefaultVisit(_list_generator);
+		}
 	}
 
 

SyntaxTree/tree/HierarchyVisitor.cs

@@ -2109,6 +2109,22 @@ public virtual void post_do_visit(to_expr _to_expr)
 		{
 		}
 
+		public virtual void pre_do_visit(global_statement _global_statement)
+		{
+		}
+
+		public virtual void post_do_visit(global_statement _global_statement)
+		{
+		}
+
+		public virtual void pre_do_visit(list_generator _list_generator)
+		{
+		}
+
+		public virtual void post_do_visit(list_generator _list_generator)
+		{
+		}
+
 		public override void visit(expression _expression)
 		{
 			DefaultVisit(_expression);
@@ -4359,6 +4375,25 @@ public override void visit(to_expr _to_expr)
 			visit(to_expr.value);
 			post_do_visit(_to_expr);
 		}
+
+		public override void visit(global_statement _global_statement)
+		{
+			DefaultVisit(_global_statement);
+			pre_do_visit(_global_statement);
+			visit(global_statement.idents);
+			post_do_visit(_global_statement);
+		}
+
+		public override void visit(list_generator _list_generator)
+		{
+			DefaultVisit(_list_generator);
+			pre_do_visit(_list_generator);
+			visit(list_generator._expr);
+			visit(list_generator._ident);
+			visit(list_generator._range);
+			visit(list_generator._condition);
+			post_do_visit(_list_generator);
+		}
 	}
 
 

SyntaxTree/tree/SyntaxTreeStreamReader.cs

@@ -546,6 +546,10 @@ public syntax_tree_node _construct_node(Int16 node_class_number)
 					return new let_var_expr();
 				case 262:
 					return new to_expr();
+				case 263:
+					return new global_statement();
+				case 264:
+					return new list_generator();
 			}
 			return null;
 		}
@@ -4584,6 +4588,33 @@ public void read_to_expr(to_expr _to_expr)
 			_to_expr.value = _read_node() as expression;
 		}
 
+
+		public void visit(global_statement _global_statement)
+		{
+			read_global_statement(_global_statement);
+		}
+
+		public void read_global_statement(global_statement _global_statement)
+		{
+			read_statement(_global_statement);
+			_global_statement.idents = _read_node() as ident_list;
+		}
+
+
+		public void visit(list_generator _list_generator)
+		{
+			read_list_generator(_list_generator);
+		}
+
+		public void read_list_generator(list_generator _list_generator)
+		{
+			read_expression(_list_generator);
+			_list_generator._expr = _read_node() as expression;
+			_list_generator._ident = _read_node() as ident;
+			_list_generator._range = _read_node() as expression;
+			_list_generator._condition = _read_node() as expression;
+		}
+
 	}
 
 

SyntaxTree/tree/SyntaxTreeStreamWriter.cs

@@ -7211,6 +7211,75 @@ public void write_to_expr(to_expr _to_expr)
 			}
 		}
 
+
+		public void visit(global_statement _global_statement)
+		{
+			bw.Write((Int16)263);
+			write_global_statement(_global_statement);
+		}
+
+		public void write_global_statement(global_statement _global_statement)
+		{
+			write_statement(_global_statement);
+			if (_global_statement.idents == null)
+			{
+				bw.Write((byte)0);
+			}
+			else
+			{
+				bw.Write((byte)1);
+				_global_statement.idents.visit(this);
+			}
+		}
+
+
+		public void visit(list_generator _list_generator)
+		{
+			bw.Write((Int16)264);
+			write_list_generator(_list_generator);
+		}
+
+		public void write_list_generator(list_generator _list_generator)
+		{
+			write_expression(_list_generator);
+			if (_list_generator._expr == null)
+			{
+				bw.Write((byte)0);
+			}
+			else
+			{
+				bw.Write((byte)1);
+				_list_generator._expr.visit(this);
+			}
+			if (_list_generator._ident == null)
+			{
+				bw.Write((byte)0);
+			}
+			else
+			{
+				bw.Write((byte)1);
+				_list_generator._ident.visit(this);
+			}
+			if (_list_generator._range == null)
+			{
+				bw.Write((byte)0);
+			}
+			else
+			{
+				bw.Write((byte)1);
+				_list_generator._range.visit(this);
+			}
+			if (_list_generator._condition == null)
+			{
+				bw.Write((byte)0);
+			}
+			else
+			{
+				bw.Write((byte)1);
+				_list_generator._condition.visit(this);
+			}
+		}
+
 	}