This commit was manufactured by cvs2svn to create tag 'TOKENZR_ORIG'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/TOKENZR_ORIG@2882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

distrib/msw/tmake/filelist.t

@@ -1,84 +0,0 @@
-#!#############################################################################
-#! File:    filelist.t
-#! Purpose: tmake template file containig Perl code to parse the filelist.txt
-#!          file - this is used by all other templates.
-#! Author:  Vadim Zeitlin
-#! Created: 14.07.99
-#! Version: $Id$
-#!#############################################################################
-#${
-    open(FILELIST, "filelist.txt") or die "Can't open filelist file: $!\n";
-
-    line: while ( defined($_ = <FILELIST>) ) {
-        chomp;
-
-        #! comment or blank line, skip
-        next line if ( $_ eq "" or /^#/ );
-
-        #! if ( $verbose ) {
-        #!     print STDERR "Processing line: '$_'\n";
-        #! }
-
-        my @fields = split "\t";
-        if ( $#fields > 2 ) {
-            warn "Ignoring malformed line $_ in the filelist file.\n";
-            next line;
-        } elsif ( $#fields == 1 ) {
-            #! add an empty flags string
-            $fields[2] = "";
-        }
-
-        if ( $verbose ) {
-            print STDERR "File $fields[0]: type '$fields[1]', flags '$fields[2]'\n";
-        }
-
-        #! first column is filename, second is type, third is flags
-        if ( $fields[1] eq "C" ) {
-            $wxCommon{$fields[0]} = $fields[2];
-        } elsif ( $fields[1] eq "G" ) {
-            $wxGeneric{$fields[0]} = $fields[2];
-        } elsif ( $fields[1] eq "M" ) {
-            $wxMSW{$fields[0]} = $fields[2];
-        } elsif ( $fields[1] eq "X" ) {
-            $wxMOTIF{$fields[0]} = $fields[2];
-        } elsif ( $fields[1] eq "R" ) {
-            $wxGTK{$fields[0]} = $fields[2];
-        } elsif ( $fields[1] eq "O" ) {
-            $wxOS2PM{$fields[0]} = $fields[2];
-        } elsif ( $fields[1] eq "H" ) {
-            $wxHTML{$fields[0]} = $fields[2];
-        } elsif ( $fields[1] eq "J" ) {
-            $wxOGL{$fields[0]} = $fields[2];
-        } elsif ( $fields[1] eq "U" ) {
-            $wxUNIX{$fields[0]} = $fields[2];
-        } elsif ( $fields[1] eq "B" ) {
-            $wxBase{$fields[0]} = $fields[2];
-        } elsif ( $fields[1] eq "W" ) {
-            $wxWXINCLUDE{$fields[0]} = $fields[2];
-        } elsif ( $fields[1] eq "P" ) {
-            $wxPROTOCOLINCLUDE{$fields[0]} = $fields[2];
-        } elsif ( $fields[1] eq "L" ) {
-            $wxHTMLINCLUDE{$fields[0]} = $fields[2];
-        } elsif ( $fields[1] eq "Z" ) {
-            $wxOGLINCLUDE{$fields[0]} = $fields[2];
-        } elsif ( $fields[1] eq "F" ) {
-            $wxMOTIFINCLUDE{$fields[0]} = $fields[2];
-        } elsif ( $fields[1] eq "9" ) {
-            $wxMSWINCLUDE{$fields[0]} = $fields[2];
-        } elsif ( $fields[1] eq "K" ) {
-            $wxGTKINCLUDE{$fields[0]} = $fields[2];
-        } elsif ( $fields[1] eq "2" ) {
-            $wxOS2PMINCLUDE{$fields[0]} = $fields[2];
-        } elsif ( $fields[1] eq "S" ) {
-            $wxUNIXINCLUDE{$fields[0]} = $fields[2];
-        } elsif ( $fields[1] eq "N" ) {
-            $wxGENERICINCLUDE{$fields[0]} = $fields[2];
-        } else {
-            warn "Unknown file type $fields[1] for $fields[0], ignoring.\n";
-            next line;
-        }
-    }
-
-    close(FILELIST);
-#$}
-#! vim:sw=4:ts=4:list:et

distrib/msw/tmake/gtk.t

@@ -1,149 +0,0 @@
-#!################################################################################
-#! File:    gtk.t
-#! Purpose: tmake template file from which src/gtk/files.lst containing the
-#!          list of files for wxGTK library is generated by tmake
-#! Author:  Vadim Zeitlin
-#! Created: 28.01.00
-#! Version: $Id$
-#!################################################################################
-#${
-    #! include the code which parses filelist.txt file and initializes
-    #! %wxCommon, %wxGeneric, %wxHtml, %wxUNIX, %wxGTK, %wxMOTIF and
-    #! %wxOS2PM hashes.
-    IncludeTemplate("filelist.t");
-
-    #! find all our sources
-    $project{"COMMONOBJS"} .= "parser.o ";
-    $project{"COMMONDEPS"} .= "parser.d ";
-
-    foreach $file (sort keys %wxGeneric) {
-        next if $wxGeneric{$file} =~ /\bR\b/;
-
-        ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
-
-        $project{"GTK_SOURCES"} .= "generic/" . $file . " ";
-        $project{"GENERICOBJS"} .= $fileobj . " ";
-        $project{"GENERICDEPS"} .= $filedep . " "
-    }
-
-    foreach $file (sort keys %wxCommon) {
-        next if $wxCommon{$file} =~ /\bR\b/;
-
-        ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
-
-        $project{"GTK_SOURCES"} .= "common/" . $file . " ";
-        $project{"COMMONOBJS"} .= $fileobj . " ";
-        $project{"COMMONDEPS"} .= $filedep . " "
-    }
-
-    foreach $file (sort keys %wxGTK) {
-        ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
-
-        $project{"GTK_SOURCES"} .= "gtk/" . $file . " ";
-        $project{"GUIOBJS"} .= $fileobj . " ";
-        $project{"GUIDEPS"} .= $filedep . " "
-    }
-
-    foreach $file (sort keys %wxUNIX) {
-        ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
-
-        $project{"GTK_SOURCES"} .= "unix/" . $file . " ";
-        $project{"UNIXOBJS"} .= $fileobj . " ";
-        $project{"UNIXDEPS"} .= $filedep . " "
-    }
-
-    foreach $file (sort keys %wxHTML) {
-        ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
-
-        $project{"GTK_SOURCES"} .= "html/" . $file . " ";
-        $project{"HTMLOBJS"} .= $fileobj . " ";
-        $project{"HTMLDEPS"} .= $filedep . " "
-    }
-    
-    foreach $file (sort keys %wxOGL) {
-        ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
-
-        $project{"GTK_SOURCES"} .= "ogl/" . $file . " ";
-        $project{"OGLOBJS"} .= $fileobj . " ";
-        $project{"OGLDEPS"} .= $filedep . " "
-    }
-    
-    #! find all our headers
-    foreach $file (sort keys %wxWXINCLUDE) {
-        $project{"GTK_HEADERS"} .= $file . " "
-    }
-
-    foreach $file (sort keys %wxGTKINCLUDE) {
-        $project{"GTK_HEADERS"} .= "gtk/" . $file . " "
-    }
-
-    foreach $file (sort keys %wxGENERICINCLUDE) {
-        $project{"GTK_HEADERS"} .= "generic/" . $file . " "
-    }
-
-    foreach $file (sort keys %wxUNIXINCLUDE) {
-        $project{"GTK_HEADERS"} .= "unix/" . $file . " "
-    }
-
-    foreach $file (sort keys %wxHTMLINCLUDE) {
-        $project{"GTK_HEADERS"} .= "html/" . $file . " "
-    }
-
-    foreach $file (sort keys %wxOGLINCLUDE) {
-        $project{"GTK_HEADERS"} .= "ogl/" . $file . " "
-    }
-
-    foreach $file (sort keys %wxPROTOCOLINCLUDE) {
-        $project{"GTK_HEADERS"} .= "protocol/" . $file . " "
-    }
-#$}
-# This file was automatically generated by tmake at #$ Now()
-# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
-ALL_SOURCES = \
-		#$ ExpandList("GTK_SOURCES");
-
-ALL_HEADERS = \
-		#$ ExpandList("GTK_HEADERS");
-
-COMMONOBJS = \
-		#$ ExpandList("COMMONOBJS");
-
-COMMONDEPS = \
-		#$ ExpandList("COMMONDEPS");
-
-GENERICOBJS = \
-		#$ ExpandList("GENERICOBJS");
-
-GENERICDEPS = \
-		#$ ExpandList("GENERICDEPS");
-
-GUIOBJS = \
-		#$ ExpandList("GUIOBJS");
-
-GUIDEPS = \
-		#$ ExpandList("GUIDEPS");
-
-UNIXOBJS = \
-		#$ ExpandList("UNIXOBJS");
-
-UNIXDEPS = \
-		#$ ExpandList("UNIXDEPS");
-
-HTMLOBJS = \
-		#$ ExpandList("HTMLOBJS");
-
-HTMLDEPS = \
-		#$ ExpandList("HTMLDEPS");
-
-OGLOBJS = \
-		#$ ExpandList("OGLOBJS");
-
-OGLDEPS = \
-		#$ ExpandList("OGLDEPS");
-

include/wx/tokenzr.h

@@ -0,0 +1,57 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        tokenzr.h
+// Purpose:     String tokenizer
+// Author:      Guilhem Lavaux
+// Modified by:
+// Created:     04/22/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Guilhem Lavaux
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_TOKENZRH
+#define _WX_TOKENZRH
+
+#ifdef __GNUG__
+#pragma interface
+#endif
+
+#include "wx/object.h"
+#include "wx/string.h"
+#include "wx/filefn.h"
+
+class WXDLLEXPORT wxStringTokenizer : public wxObject
+{
+public:
+    wxStringTokenizer(const wxString& to_tokenize,
+                      const wxString& delims = " \t\r\n",
+                      bool ret_delim = FALSE);
+    wxStringTokenizer() { m_retdelims = FALSE;}
+    virtual ~wxStringTokenizer();
+
+    int CountTokens() const;
+    bool HasMoreTokens();
+
+    wxString NextToken();
+    wxString GetNextToken() { return NextToken(); };
+
+    wxString GetString() const { return m_string; }
+
+    void SetString(const wxString& to_tokenize,
+                   const wxString& delims = " \t\r\n",
+                   bool ret_delim = FALSE)
+    {
+        m_string = to_tokenize;
+        m_delims = delims;
+        m_retdelims = ret_delim;
+    }
+
+protected:
+    off_t FindDelims(const wxString& str, const wxString& delims) const;
+    void EatLeadingDelims();
+
+    wxString m_string, m_delims;
+    bool m_retdelims;
+};
+
+#endif // _WX_TOKENZRH

src/common/tokenzr.cpp

@@ -0,0 +1,138 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        tokenzr.cpp
+// Purpose:     String tokenizer
+// Author:      Guilhem Lavaux
+// Modified by:
+// Created:     04/22/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Guilhem Lavaux
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifdef __GNUG__
+    #pragma implementation "tokenzr.h"
+#endif
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/tokenzr.h"
+
+wxStringTokenizer::wxStringTokenizer(const wxString& to_tokenize,
+                                     const wxString& delims,
+                                     bool ret_delims)
+{
+    m_string = to_tokenize;
+    m_delims = delims;
+    m_retdelims = ret_delims;
+}
+
+wxStringTokenizer::~wxStringTokenizer()
+{
+}
+
+off_t wxStringTokenizer::FindDelims(const wxString& str, const wxString& delims) const
+{
+    for ( size_t i = 0; i < str.Length(); i++ )
+    {
+        wxChar c = str[i];
+
+        for ( size_t j = 0; j < delims.Length() ; j++ )
+        {
+            if ( delims[j] == c )
+                return i;
+        }
+    }
+
+    return -1;
+}
+
+int wxStringTokenizer::CountTokens() const
+{
+    wxString p_string = m_string;
+    bool found = TRUE;
+    int pos, count = 1;
+
+    if (p_string.Length() == 0)
+        return 0;
+
+    while (found)
+    {
+        pos = FindDelims(p_string, m_delims);
+        if (pos != -1)
+        {
+            count++;
+            p_string = p_string(pos+1, p_string.Length());
+        }
+        else
+        {
+            found = FALSE;
+        }
+    }
+
+    return count;
+}
+
+bool wxStringTokenizer::HasMoreTokens()
+{
+    return !m_string.IsEmpty();
+}
+
+// needed to fix leading whitespace / mult. delims bugs
+void wxStringTokenizer::EatLeadingDelims()
+{
+    int pos;
+
+    // while leading delims trim 'em from the left
+    while ( ( pos = FindDelims(m_string, m_delims)) == 0 )
+    {
+        m_string = m_string.Mid((size_t)1);
+    }
+}
+
+wxString wxStringTokenizer::NextToken()
+{
+    off_t pos, pos2;
+    wxString r_string;
+
+    if ( m_string.IsEmpty() )
+        return m_string;
+
+    if ( !m_retdelims )
+        EatLeadingDelims();
+
+    pos = FindDelims(m_string, m_delims);
+    if (pos == -1)
+    {
+        r_string = m_string;
+        m_string = wxEmptyString;
+
+        return r_string;
+    }
+
+    if (m_retdelims)
+    {
+        if (!pos)
+        {
+            pos++;
+            pos2 = 1;
+        }
+        else
+        {
+            pos2 = pos;
+        }
+    }
+    else
+    {
+        pos2 = pos + 1;
+    }
+
+    r_string = m_string.Left((size_t)pos);
+    m_string = m_string.Mid((size_t)pos2);
+
+    return r_string;
+}