added comments and minor refactoring

Author: amroel

src/NHibernate/Dialect/BitwiseFunctionOperation.cs

@@ -7,13 +7,22 @@
 
 namespace NHibernate.Dialect
 {
+/// <summary>
+/// Treats bitwise operations as SQL function calls.
+/// </summary>
 [Serializable]
 public class BitwiseFunctionOperation : ISQLFunction
 {
 private readonly string _functionName;
 private SqlStringBuilder _sqlBuffer;
 private Queue _args;
 
+/// <summary>
+/// Creates an instance of this class using the provided function name
+/// </summary>
+/// <param name="functionName">
+/// The bitwise function name as defined by the SQL-Dialect
+/// </param>
 public BitwiseFunctionOperation(string functionName)
 {
 _functionName = functionName;
@@ -40,12 +49,12 @@ public SqlString Render(IList args, ISessionFactoryImplementor factory)
 {
 Prepare(args);
 
-Function(); 
+AddFunctionName(); 
 OpenParens(); 
-Arguments(); 
+AddArguments(); 
 CloseParens();
 
-return _sqlBuffer.ToSqlString();
+return SqlResult();
 }
 
 #endregion
@@ -66,7 +75,7 @@ private static bool IsParens(string candidate)
 return candidate == "(" || candidate == ")";
 }
 
-private void Function()
+private void AddFunctionName()
 {
 _sqlBuffer.Add(_functionName);
 }
@@ -76,7 +85,7 @@ private void OpenParens()
 _sqlBuffer.Add("(");
 }
 
-private void Arguments()
+private void AddArguments()
 {
 while (_args.Count > 0)
 {
@@ -94,5 +103,10 @@ private void CloseParens()
 {
 _sqlBuffer.Add(")");
 }
+
+private SqlString SqlResult()
+{
+return _sqlBuffer.ToSqlString();
+}
 }
 }

src/NHibernate/Dialect/BitwiseNativeOperation.cs

@@ -7,16 +7,41 @@
 
 namespace NHibernate.Dialect
 {
+/// <summary>
+/// Treats bitwise operations as native operations.
+/// </summary>
+/// </remarks>
 [Serializable]
 public class BitwiseNativeOperation : ISQLFunction
 {
-private readonly string _sqlToken;
+private readonly string _sqlOpToken;
+private readonly bool _isNot;
  private Queue _args;
 private SqlStringBuilder _sqlBuffer;
 
-public BitwiseNativeOperation(string sqlToken)
+/// <summary>
+/// creates an instance using the giving token
+/// </summary>
+/// <param name="sqlOpToken">
+/// The operation token
+/// </param>
+/// <remarks>
+/// Use this constructor only if the token DOES NOT represent a NOT-Operation
+/// </remarks>
+public BitwiseNativeOperation(string sqlOpToken)
+: this(sqlOpToken, false)
 {
-_sqlToken = sqlToken;
+}
+
+ /// <summary>
+/// creates an instance using the giving token and the flag indicating a NOT-Operation
+ /// </summary>
+ /// <param name="sqlOpToken"></param>
+ /// <param name="isNot"></param>
+public BitwiseNativeOperation(string sqlOpToken, bool isNot)
+{
+_sqlOpToken = sqlOpToken;
+_isNot = isNot;
 }
 
 #region ISQLFunction Members
@@ -39,7 +64,7 @@ public bool HasParenthesesIfNoArguments
 public SqlString Render(IList args, ISessionFactoryImplementor factory)
 {
 Prepare(args);
-if (_sqlToken != "~")
+if (_isNot == false)
 AddFirstArgument();
 AddToken();
 AddRestOfArguments();
@@ -62,7 +87,7 @@ private void AddFirstArgument()
 
 private void AddToken()
 {
-AddToBuffer(string.Format(" {0} ", _sqlToken));
+AddToBuffer(string.Format(" {0} ", _sqlOpToken));
 }
 
 private void AddRestOfArguments()

src/NHibernate/Dialect/Dialect.cs

@@ -117,7 +117,7 @@ protected Dialect()
 RegisterFunction("band", new BitwiseNativeOperation("&"));
 RegisterFunction("bor", new BitwiseNativeOperation("|"));
 RegisterFunction("bxor", new BitwiseNativeOperation("^"));
-RegisterFunction("bnot", new BitwiseNativeOperation("~"));
+RegisterFunction("bnot", new BitwiseNativeOperation("~", true));
 
 RegisterFunction("str", new SQLFunctionTemplate(NHibernateUtil.String, "cast(?1 as char)"));