| Index: third_party/hunspell/src/parsers/firstparser.cxx
|
| diff --git a/third_party/hunspell/src/parsers/firstparser.cxx b/third_party/hunspell/src/parsers/firstparser.cxx
|
| index 786ecea2eeb5da6f619a55d3b55671cecbfb929b..17fc9e9141b5085290bd3966d74a9758db9111b2 100644
|
| --- a/third_party/hunspell/src/parsers/firstparser.cxx
|
| +++ b/third_party/hunspell/src/parsers/firstparser.cxx
|
| @@ -1,3 +1,43 @@
|
| +/* ***** BEGIN LICENSE BLOCK *****
|
| + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
| + *
|
| + * The contents of this file are subject to the Mozilla Public License Version
|
| + * 1.1 (the "License"); you may not use this file except in compliance with
|
| + * the License. You may obtain a copy of the License at
|
| + * http://www.mozilla.org/MPL/
|
| + *
|
| + * Software distributed under the License is distributed on an "AS IS" basis,
|
| + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
| + * for the specific language governing rights and limitations under the
|
| + * License.
|
| + *
|
| + * The Original Code is Hunspell, based on MySpell.
|
| + *
|
| + * The Initial Developers of the Original Code are
|
| + * Kevin Hendricks (MySpell) and Németh László (Hunspell).
|
| + * Portions created by the Initial Developers are Copyright (C) 2002-2005
|
| + * the Initial Developers. All Rights Reserved.
|
| + *
|
| + * Contributor(s): David Einstein, Davide Prina, Giuseppe Modugno,
|
| + * Gianluca Turconi, Simon Brouwer, Noll János, Bíró Árpád,
|
| + * Goldman Eleonóra, Sarlós Tamás, Bencsáth Boldizsár, Halácsy Péter,
|
| + * Dvornik László, Gefferth András, Nagy Viktor, Varga Dániel, Chris Halls,
|
| + * Rene Engelhard, Bram Moolenaar, Dafydd Jones, Harri Pitkänen
|
| + *
|
| + * Alternatively, the contents of this file may be used under the terms of
|
| + * either the GNU General Public License Version 2 or later (the "GPL"), or
|
| + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
| + * in which case the provisions of the GPL or the LGPL are applicable instead
|
| + * of those above. If you wish to allow use of your version of this file only
|
| + * under the terms of either the GPL or the LGPL, and not to allow others to
|
| + * use your version of this file under the terms of the MPL, indicate your
|
| + * decision by deleting the provisions above and replace them with the notice
|
| + * and other provisions required by the GPL or the LGPL. If you do not delete
|
| + * the provisions above, a recipient may use your version of this file under
|
| + * the terms of any one of the MPL, the GPL or the LGPL.
|
| + *
|
| + * ***** END LICENSE BLOCK ***** */
|
| +
|
| #include <cstdlib>
|
| #include <cstring>
|
| #include <cstdio>
|
| @@ -10,24 +50,19 @@
|
| using namespace std;
|
| #endif
|
|
|
| -FirstParser::FirstParser(const char * wordchars)
|
| -{
|
| - init(wordchars);
|
| +FirstParser::FirstParser(const char* wordchars)
|
| + : TextParser(wordchars) {
|
| }
|
|
|
| -FirstParser::~FirstParser()
|
| -{
|
| -}
|
| +FirstParser::~FirstParser() {}
|
|
|
| -char * FirstParser::next_token()
|
| -{
|
| - char * tabpos = strchr(line[actual],'\t');
|
| - if ((tabpos) && (tabpos - line[actual]>token)) {
|
| - char * t = (char *) malloc(tabpos - line[actual] + 1);
|
| - t[tabpos - line[actual]] = '\0';
|
| - token = tabpos - line[actual] +1;
|
| - if (t) return strncpy(t, line[actual], tabpos - line[actual]);
|
| - fprintf(stderr,"Error - Insufficient Memory\n");
|
| - }
|
| - return NULL;
|
| +bool FirstParser::next_token(std::string& t) {
|
| + t.clear();
|
| + const size_t tabpos = line[actual].find('\t');
|
| + if (tabpos != std::string::npos && tabpos > token) {
|
| + token = tabpos;
|
| + t = line[actual].substr(0, tabpos);
|
| + return true;
|
| + }
|
| + return false;
|
| }
|
|
|