[Anyedit-cvs]AnyEditv2 AnyEdit.dsp,1.21,1.22 ClassView.cpp,1.18,1.19 ClassView.h,1.14,1.15 TagList.c

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1:/tmp/cvs-serv2344

Modified Files:
	AnyEdit.dsp ClassView.cpp ClassView.h TagList.cpp TagList.h 
	TagParser.cpp 
Log Message:
Intelligent tag parser...

Index: AnyEdit.dsp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.dsp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** AnyEdit.dsp	11 Aug 2003 17:21:50 -0000	1.21
--- AnyEdit.dsp	12 Aug 2003 13:26:35 -0000	1.22
***************
*** 246,249 ****
--- 246,257 ----
  # Begin Source File
  
+ SOURCE=.\LBSpinButtonCtrl.cpp
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=.\LBSpinButtonCtrl.h
+ # End Source File
+ # Begin Source File
+ 
  SOURCE=.\MainFrm.cpp
  # End Source File

Index: ClassView.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/ClassView.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** ClassView.cpp	11 Aug 2003 17:21:50 -0000	1.18
--- ClassView.cpp	12 Aug 2003 13:26:35 -0000	1.19
***************
*** 334,338 ****
          ttempItem=TVI_FIRST;
  
!     int imnum = GetImageForAccess(ent->access);
  
      HTREEITEM newItem = InsertItem(ent->tagname,imnum,imnum,parItem,ttempItem);
--- 334,338 ----
          ttempItem=TVI_FIRST;
  
!     int imnum = GetImageForAccess(ent);
  
      HTREEITEM newItem = InsertItem(ent->tagname,imnum,imnum,parItem,ttempItem);
***************
*** 395,399 ****
          ttempItem=TVI_FIRST;
  
!     int imnum = GetImageForAccess(ent->access);
  
      HTREEITEM newItem = InsertItem(ent->tagname,imnum,imnum,parItem,ttempItem);
--- 395,399 ----
          ttempItem=TVI_FIRST;
  
!     int imnum = GetImageForAccess(ent);
  
      HTREEITEM newItem = InsertItem(ent->tagname,imnum,imnum,parItem,ttempItem);
***************
*** 583,587 ****
                  };
                  //SetItemData(hItem,ent->lineno);
!                 int imnum = GetImageForAccess(ent->access);
                  int oldnum=0;
                  int oldselnum=0;
--- 583,587 ----
                  };
                  //SetItemData(hItem,ent->lineno);
!                 int imnum = GetImageForAccess(ent);
                  int oldnum=0;
                  int oldselnum=0;
***************
*** 612,628 ****
  }
  
! int CClassView::GetImageForAccess(int acc)
  {
!     switch(acc)
      {
!     case 1:
!         return 1;
!         break;
!     case 2:
!         return 4;
!         break;
!     case 3:
!         return 3;
!         break;
      }
  
--- 612,734 ----
  }
  
! int CClassView::GetImageFTC(CTagEntry * acc)
  {
! 	switch(acc->type)
! 			{
! 			case 'f': // If it is a function
! 				{
! 					switch(acc->access)
! 					{
! 					case 1:
! 						return 1;
! 						break;
! 					case 2:
! 						return 4;
! 						break;
! 					case 3:
! 						return 3;
! 						break;
! 					default:
! 						return 8;
! 					}
! 				
! 				}
! 				break;
! 
! 			case 'v':
! 			case 'm':
! 				{
! 					switch(acc->access)
! 					{
! 					case 1:
! 						return 2;
! 						break;
! 					case 2:
! 						return 11;
! 						break;
! 					case 3:
! 						return 10;
! 						break;
! 					default:
! 						return 9;
! 					}				
! 				}
! 				break;
! 			}
! 
! 	return 8;
! }
! 
! int CClassView::GetImageFTJAVA(CTagEntry * acc)
! {
! 		switch(acc->type)
! 			{
! 			case 'm': // If it is a function
! 				{
! 					switch(acc->access)
! 					{
! 					case 1:
! 						return 1;
! 						break;
! 					case 2:
! 						return 4;
! 						break;
! 					case 3:
! 						return 3;
! 						break;
! 					default:
! 						return 8;
! 					}
! 				
! 				}
! 				break;
! 
! 			case 'f':
! 				{
! 					switch(acc->access)
! 					{
! 					case 1:
! 						return 2;
! 						break;
! 					case 2:
! 						return 11;
! 						break;
! 					case 3:
! 						return 10;
! 						break;
! 					default:
! 						return 9;
! 					}				
! 				}
! 				break;
! 			}
! 	return 8;
! }
! 
! int CClassView::GetImageFTCSHARP(CTagEntry * acc)
! {
! 	return 8;
! }
! 
! int CClassView::GetImageFTPYTHON(CTagEntry * acc)
! {
! 	return 8;
! }
! 
! int CClassView::GetImageFTPHP(CTagEntry * acc)
! {
! 	return 8;
! }
! 
! int CClassView::GetImageForAccess(CTagEntry * acc)
! {
!     switch(acc->filetype)
      {
! 		case FT_C: //In case of C,CPP files
! 			return GetImageFTC(acc);
! 			break;
! 		case FT_JAVA:
! 			return GetImageFTJAVA(acc);
! 			break;
      }
  

Index: ClassView.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/ClassView.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ClassView.h	8 May 2003 12:00:56 -0000	1.14
--- ClassView.h	12 Aug 2003 13:26:35 -0000	1.15
***************
*** 58,74 ****
      BOOL IsItemClass(HTREEITEM hitem);
      void WalkThroughAllItemsDataAndDeleteIt(HTREEITEM startFrom);
!     int GetImageForAccess(int acc);
      void CheckMember(HTREEITEM hItem, CTagList * taglist);
      void CheckClass(HTREEITEM hItem, CTagList * tagList);
      void CheckThisItem(HTREEITEM hItem, CTagList * taglist);
      void CheckTagList(HTREEITEM hItem,CTagList * taglist);
!     void InsertFunction(CTagEntry
!                         * ent);
!     CTagEntry
!     * InsertFunctionByLine(CTagEntry
!                            * ent);
!     CTagEntry
!     * InsertFunctionByAlphabet(CTagEntry
!                                * ent);
  
      HTREEITEM GetItemFromClassName(LPCSTR clName, HTREEITEM hItem);
--- 58,74 ----
      BOOL IsItemClass(HTREEITEM hitem);
      void WalkThroughAllItemsDataAndDeleteIt(HTREEITEM startFrom);
!     int GetImageForAccess(CTagEntry * acc);
      void CheckMember(HTREEITEM hItem, CTagList * taglist);
      void CheckClass(HTREEITEM hItem, CTagList * tagList);
      void CheckThisItem(HTREEITEM hItem, CTagList * taglist);
      void CheckTagList(HTREEITEM hItem,CTagList * taglist);
!     void InsertFunction(CTagEntry * ent);
!     CTagEntry* InsertFunctionByLine(CTagEntry * ent);
!     CTagEntry* InsertFunctionByAlphabet(CTagEntry* ent);
! 	int GetImageFTC(CTagEntry * ent);
! 	int GetImageFTJAVA(CTagEntry * ent);
! 	int GetImageFTCSHARP(CTagEntry * ent);
! 	int GetImageFTPYTHON(CTagEntry * ent);
! 	int GetImageFTPHP(CTagEntry * ent);
  
      HTREEITEM GetItemFromClassName(LPCSTR clName, HTREEITEM hItem);

Index: TagList.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/TagList.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TagList.cpp	8 May 2003 12:00:56 -0000	1.7
--- TagList.cpp	12 Aug 2003 13:26:35 -0000	1.8
***************
*** 69,76 ****
          break;
      case 'f':
          functionlist.AddTail(ent);
          break;
      default:
!         otherlist.AddTail(ent);
      }
  }
--- 69,78 ----
          break;
      case 'f':
+ 	case 'v':
+ 	case 'm':
          functionlist.AddTail(ent);
          break;
      default:
! 		otherlist.AddTail(ent);
      }
  }

Index: TagList.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/TagList.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TagList.h	8 May 2003 12:00:56 -0000	1.6
--- TagList.h	12 Aug 2003 13:26:35 -0000	1.7
***************
*** 10,23 ****
  #endif // _MSC_VER > 1000
  
  class CTagEntry
              : public CObject
  {
  public:
!     CTagEntry
!     ()
      {
          lineno=0;
          access=0;
          deleted = FALSE;
      };
      CTagEntry
--- 10,31 ----
  #endif // _MSC_VER > 1000
  
+ #define FT_COMMON 0
+ #define FT_JAVA 1
+ #define FT_C 2
+ #define FT_CSHARP 3
+ #define FT_PYTHON 4
+ #define FT_PHP 5
+ #define FT_JS 6
+ 
  class CTagEntry
              : public CObject
  {
  public:
!     CTagEntry()
      {
          lineno=0;
          access=0;
          deleted = FALSE;
+ 		filetype=FT_COMMON;
      };
      CTagEntry
***************
*** 34,37 ****
--- 42,47 ----
              filename=original->filename;
              tagDefinition=original->tagDefinition;
+ 			filetype=original->filetype;
+ 			deleted=original->deleted;
          };
      };
***************
*** 45,48 ****
--- 55,59 ----
      CString tagDefinition;
      BOOL deleted;
+ 	int filetype;
  };
  

Index: TagParser.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/TagParser.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TagParser.cpp	8 May 2003 12:00:56 -0000	1.8
--- TagParser.cpp	12 Aug 2003 13:26:35 -0000	1.9
***************
*** 45,48 ****
--- 45,90 ----
  }
  
+ int GetFileType(LPCSTR extension)
+ {
+ 	if(strcmp(extension,"C")==0)
+ 	{
+ 	return FT_C;
+ 	}else if(strcmp(extension,"CPP")==0)
+ 	{
+ 	return FT_C;
+ 	}else if(strcmp(extension,"H")==0)
+ 	{
+ 	return FT_C;
+ 	}else if(strcmp(extension,"HPP")==0)
+ 	{
+ 	return FT_C;
+ 	}else if(strcmp(extension,"CXX")==0)
+ 	{
+ 	return FT_C;
+ 	}else if(strcmp(extension,"HXX")==0)
+ 	{
+ 	return FT_C;
+ 	}else if(strcmp(extension,"JAVA")==0)
+ 	{
+ 	return FT_JAVA;
+ 	}else if(strcmp(extension,"JAV")==0)
+ 	{
+ 	return FT_JAVA;
+ 	}else if(strcmp(extension,"PHP")==0)
+ 	{
+ 	return FT_PHP;
+ 	}else if(strcmp(extension,"PHP3")==0)
+ 	{
+ 	return FT_PHP;
+ 	}else if(strcmp(extension,"CS")==0)
+ 	{
+ 	return FT_CSHARP;
+ 	}else if(strcmp(extension,"PY")==0)
+ 	{
+ 	return FT_PYTHON;
+ 	}
+ 
+ 	return FT_COMMON;
+ }
  
  void CTagParser::ParseLineDetails(CTagList *list,LPCSTR linecontent)
***************
*** 87,90 ****
--- 129,133 ----
      ent->tagname = arr.GetAt(0);
      ent->filename = arr.GetAt(1);
+ 	ent->filetype = GetFileType(msc.GetFileExtension(ent->filename));
      CString tagDef=arr.GetAt(2);
      tagDef.Replace("/^","");

[Anyedit-cvs]AnyEditv2 AnyEdit.dsp,1.21,1.22 ClassView.cpp,1.18,1.19 ClassView.h,1.14,1.15 TagList.c

[Anyedit-cvs]AnyEditv2 AnyEdit.dsp,1.21,1.22 ClassView.cpp,1.18,1.19 ClassView.h,1.14,1.15 TagList.cpp,1.7,1.8 TagList.h,1.6,1.7 TagParser.cpp,1.8,1.9