AliasBinder works

CodeQL.mdp

@@ -52,7 +52,6 @@
     <File subtype="Code" buildaction="Compile" name="CqlAst/Node.cs" />
     <File subtype="Code" buildaction="Compile" name="CqlAst/StatementNode.cs" />
     <File subtype="Code" buildaction="Compile" name="CqlAst/SelectColumnNode.cs" />
-    <File subtype="Code" buildaction="Compile" name="TranslatorException.cs" />
     <File subtype="Code" buildaction="Compile" name="CqlAst/JoinType.cs" />
     <File subtype="Code" buildaction="Compile" name="Translate/AliasBinder.cs" />
     <File subtype="Code" buildaction="Compile" name="CqlAst/JoinNode.cs" />
@@ -71,6 +70,14 @@
     <File subtype="Directory" buildaction="Compile" name="." />
     <File subtype="Code" buildaction="Nothing" name="parsers/cs/cs2.y" />
     <File subtype="Directory" buildaction="Compile" name="." />
+    <File subtype="Code" buildaction="Compile" name="CqlAst/DataSource.cs" />
+    <File subtype="Code" buildaction="Compile" name="Translate/ITranslationPlugin.cs" />
+    <File subtype="Directory" buildaction="Compile" name="Linq" />
+    <File subtype="Code" buildaction="Compile" name="Linq/Enumerable.cs" />
+    <File subtype="Directory" buildaction="Compile" name="Exceptions" />
+    <File subtype="Code" buildaction="Compile" name="Exceptions/TranslatorException.cs" />
+    <File subtype="Directory" buildaction="Compile" name="." />
+    <File subtype="Code" buildaction="Compile" name="Exceptions/UnresolvedAliasException.cs" />
   </Contents>
   <MonoDevelop.Autotools.MakefileInfo RelativeMakefileName="Makefile" BuildTargetName="build">
     <BuildFilesVar />

CodeQL.mds

@@ -22,7 +22,7 @@
       <Entry build="True" name="CodeQL.Testing" configuration="Release" />
     </Configuration>
   </Configurations>
-  <StartMode startupentry="CodeQL.Testing" single="True">
+  <StartMode startupentry="CodeQL.Console" single="True">
     <Execute type="None" entry="CodeQL" />
     <Execute type="None" entry="SQLDetector" />
     <Execute type="None" entry="CodeQL.UI" />

CqlAst/ColumnExpressionNode.cs

@@ -31,6 +31,8 @@ public class ColumnExpressionNode : ExpressionNode
 	{
 		public string Name;
 		public string TableAlias;
+		/// <summary>Is set in run time by AliasBinder</summary>
+		public DataSourceNode AliasReference;
 
 		public override IEnumerable<INode> Children {
 			get {yield break;}

CqlAst/DataSource.cs

@@ -0,0 +1,32 @@
+// 
+//  DataSource.cs
+//  
+//  Author:
+//       Vadim Chekan <[email protected]>
+// 
+//  Copyright (c) 2010 Vadim Chekan
+// 
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 2 of the License, or
+//  (at your option) any later version.
+// 
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//  GNU General Public License for more details.
+//  
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// 
+using System;
+namespace CodeQL {
+	/// <summary>
+	/// Table in FROM or JOIN clause or sub-select.
+	/// </summary>
+	public abstract class DataSourceNode : Node {
+		public string Alias;
+	}
+}
+

CqlAst/TableNode.cs

@@ -27,10 +27,9 @@
 namespace CodeQL
 {
 
-	public class TableNode : Node
+	public class TableNode : DataSourceNode
 	{
 		public string Name;
-		public string Alias;
 
 		public override IEnumerable<INode> Children {
 			get {yield break;}

Exceptions/UnresolvedAliasException.cs

@@ -0,0 +1,32 @@
+// 
+//  UnresolvedAliasException.cs
+//  
+//  Author:
+//       Vadim Chekan <[email protected]>
+// 
+//  Copyright (c) 2010 Vadim Chekan
+// 
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 2 of the License, or
+//  (at your option) any later version.
+// 
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//  GNU General Public License for more details.
+//  
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// 
+using System;
+namespace CodeQL {
+	public class UnresolvedAliasException : TranslatorException {
+		public UnresolvedAliasException(ColumnExpressionNode column)
+			: base(string.Format("Alias not found: '{0}.{1}'", column.TableAlias, column.Name))
+		{
+		}
+	}
+}
+

Linq/Enumerable.cs

@@ -0,0 +1,34 @@
+// 
+//  Enumerable.cs
+//  
+//  Author:
+//       Vadim Chekan <[email protected]>
+// 
+//  Copyright (c) 2010 Vadim Chekan
+// 
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 2 of the License, or
+//  (at your option) any later version.
+// 
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//  GNU General Public License for more details.
+//  
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// 
+using System;
+using System.Collections.Generic;
+
+namespace CodeQL {
+	public static class EnumerableEx {
+		public static void ForEach<T>(this IEnumerable<T> list, Action<T> action) {
+			foreach(T x in list)
+				action(x);
+		}
+	}
+}
+

Translate/AliasBinder.cs

@@ -26,16 +26,47 @@
 using System.Linq;
 
 namespace CodeQL {
-	public class AliasBinder {
+	public class AliasBinder : ITranslationPlugin {
+
+		public void Init() {/*empty*/}
+
 		public void Run() {
 			/*
+			 * TODO: account for scope when subquery is implemented
 			 * Note: aliases have scope. Alias in subquery can override alias from the outer one.
 			 * Also alias can not be visible from sibling subqueries.
 			 */
-			var aliasTableMap = new GraphIterator<INode>(TranslationContext.Batch, node => node.Children).
-				BreadthFirst().
-				OfType<TableNode>().
-				ToDictionary(t => t.Alias, StringComparer.OrdinalIgnoreCase);
+
+			//
+			// Build alias map
+			//
+			var dataSources  = new GraphIterator<INode>(TranslationContext.Instance.Batch, node => node.Children).
+				DepthFirst().
+				OfType<DataSourceNode>();
+
+			var aliasMap = new Dictionary<string,DataSourceNode>(StringComparer.OrdinalIgnoreCase);
+			foreach(var ds in dataSources)
+				if(aliasMap.ContainsKey(ds.Alias))
+					throw new ApplicationException("Alias '"+ds.Alias+"' is declared twice");
+				else
+					aliasMap.Add(ds.Alias, ds);
+
+			// 
+			new GraphIterator<INode>(TranslationContext.Instance.Batch, n => n.Children).
+				DepthFirst().
+				OfType<ColumnExpressionNode>().
+				ForEach(c => {
+						DataSourceNode dataSource;
+						if(!aliasMap.TryGetValue(c.TableAlias, out dataSource))
+							throw new UnresolvedAliasException(c);
+						c.AliasReference = dataSource;
+				});
+
+			// fire binding events
+			foreach(var p in aliasMap)
+				if(TranslationContext.Instance.OnTableAliasBound != null)
+					TranslationContext.Instance.OnTableAliasBound(p.Key, p.Value);
+
 		}
 	}
 }

Translate/ClassHandler.cs

@@ -71,7 +71,7 @@ static ClassHandler() {
 		}
 
 		public void Run() {
-			var classTables = new GraphIterator<INode>(TranslationContext.Batch, n => n.Children).
+			var classTables = new GraphIterator<INode>(TranslationContext.Instance.Batch, n => n.Children).
 				BreadthFirst().
 				OfType<TableNode>().
 				Where(t => t.Name.Equals("class", StringComparison.InvariantCultureIgnoreCase));

Translate/ITranslationPlugin.cs

@@ -0,0 +1,30 @@
+// 
+//  ITranslationPlugin.cs
+//  
+//  Author:
+//       Vadim Chekan <[email protected]>
+// 
+//  Copyright (c) 2010 Vadim Chekan
+// 
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 2 of the License, or
+//  (at your option) any later version.
+// 
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//  GNU General Public License for more details.
+//  
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// 
+using System;
+namespace CodeQL {
+	public interface ITranslationPlugin {
+		void Init();
+		void Run();
+	}
+}
+

Translate/TranslationContext.cs

@@ -24,30 +24,31 @@
 using System;
 
 namespace CodeQL {
-
-
 	public class TranslationContext : IDisposable {
+
 		[ThreadStatic]
 		static TranslationContext _instance;
-
 		BatchNode _batch;
 
+		//
+		//
+		//
 		public TranslationContext(BatchNode batch) {
 			if(_instance != null)
 				throw new ApplicationException("Context already initialized");
 			_instance = this;
 			_batch = batch;
 		}
 
-		private static TranslationContext Instance {
+		public static TranslationContext Instance {
 			get {
 				if(_instance == null)
 					throw new ApplicationException("Context not initilized");
 				return _instance;
 			}
 		}
 
-		public static BatchNode Batch {
+		public BatchNode Batch {
 			get { return Instance._batch; }
 			internal set { Instance._batch = value; }
 		}
@@ -58,5 +59,9 @@ void IDisposable.Dispose() {
 			_instance = null;
 		}
 
+		//
+		// Events
+		//
+		public Action<string,DataSourceNode> OnTableAliasBound;
 	}
 }