[GRASS-SVN] r47779 - in grass/trunk: include lib/gis
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Aug 19 12:11:17 EDT 2011
Author: martinl
Date: 2011-08-19 09:11:17 -0700 (Fri, 19 Aug 2011)
New Revision: 47779
Modified:
grass/trunk/include/gisdefs.h
grass/trunk/lib/gis/token.c
Log:
gislib: introduce G_tokenize2()
update dox string for token.c
Modified: grass/trunk/include/gisdefs.h
===================================================================
--- grass/trunk/include/gisdefs.h 2011-08-19 15:24:53 UTC (rev 47778)
+++ grass/trunk/include/gisdefs.h 2011-08-19 16:11:17 UTC (rev 47779)
@@ -625,6 +625,7 @@
/* token.c */
char **G_tokenize(const char *, const char *);
+char **G_tokenize2(const char *, const char *, const char *);
int G_number_of_tokens(char **);
void G_free_tokens(char **);
Modified: grass/trunk/lib/gis/token.c
===================================================================
--- grass/trunk/lib/gis/token.c 2011-08-19 15:24:53 UTC (rev 47778)
+++ grass/trunk/lib/gis/token.c 2011-08-19 16:11:17 UTC (rev 47779)
@@ -1,113 +1,158 @@
-/**
- * \file token.c
- *
- * \brief GIS Library - Token functions.
- *
- * (C) 2001-2008 by the GRASS Development Team
- *
- * This program is free software under the GNU General Public License
- * (>=v2). Read the file COPYING that comes with GRASS for details.
- *
- * \author GRASS GIS Development Team
- *
- * \date 1999-2008
- */
+/*!
+ \file lib/gis/token.c
+
+ \brief GIS Library - Tokenize strings
+
+ (C) 2001-2008, 2011 by the GRASS Development Team
+
+ This program is free software under the GNU General Public License
+ (>=v2). Read the file COPYING that comes with GRASS for details.
+
+ \author USA CERL and others
+*/
#include <stdlib.h>
#include <string.h>
#include <grass/gis.h>
+static char **tokenize(const char *, const char *, const char *);
-/**
- * \brief Tokenize string.
- *
- * Given a string, <b>buf</b>, turn delimiter, <b>delim</b>, into '\0'
- * (NULL) and place pointers to tokens in tokens. <b>buf</b> must not
- * contain a new line (\n). <b>delim</b> may consist of more than one
- * character. <i>G_free_tokens()</i> must be called when finished with
- * tokens to release memory.
- *
- * Example:
- * char **tokens;
- * int ntok, i;
- * tokens = G_tokenize(buf, " |:,");
- * ntok = G_number_of_tokens(tokens);
- * for (i=0; i < ntok; i++) {
- * G_debug(0, "%d=[%s]", i, tokens[i]);
- * }
- * G_free_tokens(tokens);
- *
- * \param[in] buf input string
- * \param[in] delim string delimiter
- * \return Pointer to string token
- */
-
+/*!
+ \brief Tokenize string
+
+ Given a string, <em>buf</em>, turn delimiter, <em>delim</em>, into
+ '\0' (NULL) and place pointers to tokens in tokens. <em>buf</em>
+ must not contain a new line (\n). <em>delim</em> may consist of more
+ than one character. G_free_tokens() must be called when finished
+ with tokens to release memory.
+
+ Example:
+ \code
+ char **tokens;
+ int ntok, i;
+ tokens = G_tokenize(buf, " |:,");
+ ntok = G_number_of_tokens(tokens);
+ for (i=0; i < ntok; i++) {
+ G_debug(0, "%d=[%s]", i, tokens[i]);
+ }
+ G_free_tokens(tokens);
+ \endcode
+
+ \param buf input string
+ \param delim string delimiter
+
+ \return pointer to string token
+*/
char **G_tokenize(const char *buf, const char *delim)
{
- int i;
+ return tokenize(buf, delim, NULL);
+}
+
+/*!
+ \brief Tokenize string
+
+ This fuction behaves similarly to G_tokenize().
+
+ It introduces <em>valchar<em> which defines borders of token. Within
+ token <em>delim<em> is ignored.
+
+ Example:
+ \code
+ char *str = "a,'b,c',d";
+
+ char **tokens1, **tokens2;
+ int ntok1, ntok2;
+
+ tokens1 = G_tokenize(str, ",");
+ ntok1 = G_number_of_tokens(tokens1);
+
+ tokens1 = G_tokenize2(str, ",", "'");
+ ntok2 = G_number_of_tokens(tokens2);
+ \endcode
+
+ In this example <em>ntok1</em> will be 4, <em>ntok2</em> only 3,
+ i.e. { "a", "'b, c'", "d"}
+
+ \param buf input string
+ \param delim string delimiter
+ \param valchar character defining border of token
+
+ \return pointer to string token
+*/
+char **G_tokenize2(const char *buf, const char *delim, const char *valchar)
+{
+ return tokenize(buf, delim, valchar);
+}
+
+char **tokenize(const char *buf, const char *delim, const char *inchar)
+{
+ int i, invalue;
char **tokens;
char *p;
- i = 0;
- while (!strchr(delim, *buf) && (*buf == ' ' || *buf == '\t')) /* needed for G_free () */
+ /* needed for G_free () */
+ while (!strchr(delim, *buf) && (*buf == ' ' || *buf == '\t'))
buf++;
p = G_store(buf);
tokens = (char **)G_malloc(sizeof(char *));
- while (1) {
- while (!strchr(delim, *p) && (*p == ' ' || *p == '\t'))
+ i = 0;
+ invalue = FALSE;
+ while (TRUE) {
+ while (!(strchr(delim, *p) && !invalue) && (*p == ' ' || *p == '\t')) {
+ if (inchar && *p == *inchar)
+ invalue = invalue ? FALSE : TRUE;
p++;
+ }
if (*p == 0)
break;
tokens[i++] = p;
tokens = (char **)G_realloc((char *)tokens, (i + 1) * sizeof(char *));
- while (*p && (strchr(delim, *p) == NULL))
+ while (*p && !(strchr(delim, *p) && !invalue)) {
+ if (inchar && *p == *inchar)
+ invalue = invalue ? FALSE : TRUE;
p++;
+ }
if (*p == 0)
break;
*p++ = 0;
}
tokens[i] = NULL;
- return (tokens);
+ return tokens;
}
+/*!
+ \brief Return number of tokens
+
+ \param tokens
+
+ \return number of tokens
+*/
-/**
- * \brief Return number of tokens.
- *
- * <b>Note:</b> Function is incomplete.
- *
- * \param[in] tokens
- * \return number of tokens
- */
-
int G_number_of_tokens(char **tokens)
{
int n;
- for (n = 0; tokens[n] != NULL; n++) {
- /* nothing */
- }
-
+ n = 0;
+ for (n = 0; tokens[n] != NULL; n++)
+ ;
+
return n;
}
-
-/**
- * \brief Free memory allocated to tokens.
- *
- * <b>Note:</b> <i>G_free_tokens()</i> must be called when finished with
- * tokens to release memory.
- *
- * \param[in,out] tokens
- * \return
- */
-
+/*!
+ \brief Free memory allocated to tokens.
+
+ <b>Note:</b> <i>G_free_tokens()</i> must be called when finished with
+ tokens to release memory.
+
+ \param[out] tokens
+*/
void G_free_tokens(char **tokens)
{
if (tokens[0] != NULL)
More information about the grass-commit
mailing list