[csdoc-patches] CVS: csdoc/src/csdoc ChangeLog,1.6,1.7 cs-tokenizer.cs,1.4,1.5 driver.cs,1.4,1.5

[Gaurav V. <mas...@us...>]

Update of /cvsroot/csdoc/csdoc/src/csdoc
In directory sc8-pr-cvs1:/tmp/cvs-serv13494

Modified Files:
	ChangeLog cs-tokenizer.cs driver.cs 
Log Message:
2003-02-21

* cs-tokenizer.cs               : Reset comment if there is a blank
                        line between the comment and actual code.
* driver.cs                     : Get all types from RootContext.





Index: ChangeLog
===================================================================
RCS file: /cvsroot/csdoc/csdoc/src/csdoc/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ChangeLog	20 Feb 2003 14:31:23 -0000	1.6
+++ ChangeLog	21 Feb 2003 07:08:53 -0000	1.7
@@ -1,4 +1,10 @@
 
+2003-02-21	Gaurav Vaish <mastergaurav AT users DOT sf DOT net>
+
+	* cs-tokenizer.cs               : Reset comment if there is a blank
+	                        line between the comment and actual code.
+	* driver.cs                     : Get all types from RootContext.
+
 2003-02-20	Gaurav Vaish <mastergaurav AT users DOT sf DOT net>
 
 	* driver.cs                     : Added check for delegate.

Index: cs-tokenizer.cs
===================================================================
RCS file: /cvsroot/csdoc/csdoc/src/csdoc/cs-tokenizer.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cs-tokenizer.cs	20 Feb 2003 14:26:12 -0000	1.4
+++ cs-tokenizer.cs	21 Feb 2003 07:08:53 -0000	1.5
@@ -1625,7 +1625,7 @@
 				// Handle double-slash comments.
 				if (c == '/'){
 					int d = peekChar ();
-				
+					int afterComment;
 					if (d == '/'){
 						getChar ();
 						// Modified by Gaurav Vaish
@@ -1644,6 +1644,9 @@
 							ref_line++;
 							col = 0;
 						}
+						afterComment = peekChar();
+						if(afterComment == '\r' || afterComment=='\n')
+							commentString = "";
 						any_token_seen |= tokens_seen;
 						tokens_seen = false;
 						continue;
@@ -1669,6 +1672,9 @@
 								any_token_seen |= tokens_seen;
 								tokens_seen = false;
 							}
+							afterComment = peekChar();
+							if(afterComment == '\r' || afterComment=='\n')
+								commentString = "";
 						}
 						continue;
 					}

Index: driver.cs
===================================================================
RCS file: /cvsroot/csdoc/csdoc/src/csdoc/driver.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- driver.cs	20 Feb 2003 14:31:24 -0000	1.4
+++ driver.cs	21 Feb 2003 07:08:53 -0000	1.5
@@ -113,47 +113,6 @@
 			} finally {
 				input.Close ();
 			}
-			Tokenizer lexer = parser.Lexer;
-			Hashtable comments = lexer.Documentation;
-			Console.WriteLine("Total keys: " + comments.Count);
-			foreach(object key in comments.Keys)
-			{
-				string displayName = "";
-				if(key is Class)
-					displayName = ((Class)key).Name;
-				else if(key is Method)
-					displayName = ((Method)key).Name;
-				else if(key is Event)
-					displayName = ((Event)key).Name;
-				else if(key is Const)
-					displayName = ((Const)key).Name;
-				else if(key is Constructor)
-					displayName = ((Constructor)key).Name;
-				else if(key is Interface)
-					displayName = ((Interface)key).Name;
-				else if(key is InterfaceMethod)
-					displayName = ((InterfaceMethod)key).Name;
-				else if(key is InterfaceProperty)
-					displayName = ((InterfaceProperty)key).Name;
-				else if(key is Delegate)
-					displayName = ((Delegate)key).Name;
-				System.Console.WriteLine("{0}:\n{1}\n", displayName, comments[key]);
-				if(key is Method || key is Constructor)
-				{
-					MethodCore m = (MethodCore)key;
-					if(m.Parameters != null)
-					{
-						Parameters pars = m.Parameters;
-						if(pars.FixedParameters != null)
-						{
-							foreach(Parameter p in pars.FixedParameters)
-							{
-								Console.WriteLine("Param: <" + p.TypeName.ToString() + "::" + p.Name + ">");
-							}
-						}
-					}
-				}
-			}
 		}
 
 		static void Usage()
@@ -547,6 +506,22 @@
 			if (first_source == null){
 				Report.Error (2008, "No files to compile were specified");
 				return false;
+			}
+
+			TypeContainer tc = RootContext.Tree.Types;
+			ArrayList tree = tc.Types;
+			foreach(object current in tree)
+			{
+				string dispName = "";
+				if(current is Class)
+					dispName = ((Class)current).Name;
+				else if(current is Struct)
+					dispName = ((Struct)current).Name;
+				Console.WriteLine("<type>: " + current.GetType().ToString() + "->" + dispName);
+			}
+			foreach(Interface interf in tc.Interfaces)
+			{
+				Console.WriteLine("<type>: " + interf.GetType().ToString() + "->" + interf.Name);
 			}
 
 			return (Report.Errors == 0);