2007-03-08 04:03:40 +08:00
|
|
|
/**********************************************************************
|
|
|
|
* File: clst.h (Formerly clist.h)
|
|
|
|
* Description: CONS cell list module include file.
|
|
|
|
* Author: Phil Cheatle
|
|
|
|
* Created: Mon Jan 28 08:33:13 GMT 1991
|
|
|
|
*
|
|
|
|
* (C) Copyright 1991, Hewlett-Packard Ltd.
|
|
|
|
** Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
|
|
|
|
** Unless required by applicable law or agreed to in writing, software
|
|
|
|
** distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
** See the License for the specific language governing permissions and
|
|
|
|
** limitations under the License.
|
|
|
|
*
|
|
|
|
**********************************************************************/
|
|
|
|
|
|
|
|
#ifndef CLST_H
|
|
|
|
#define CLST_H
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include "host.h"
|
|
|
|
#include "serialis.h"
|
|
|
|
#include "lsterr.h"
|
|
|
|
|
|
|
|
class CLIST_ITERATOR;
|
|
|
|
|
|
|
|
/**********************************************************************
|
2016-11-08 02:46:33 +08:00
|
|
|
* CLASS - CLIST_LINK
|
2007-03-08 04:03:40 +08:00
|
|
|
*
|
2016-11-08 02:46:33 +08:00
|
|
|
* Generic link class for singly linked CONS cell lists
|
2007-03-08 04:03:40 +08:00
|
|
|
*
|
|
|
|
* Note: No destructor - elements are assumed to be destroyed EITHER after
|
|
|
|
* they have been extracted from a list OR by the CLIST destructor which
|
|
|
|
* walks the list.
|
|
|
|
**********************************************************************/
|
|
|
|
|
|
|
|
class DLLSYM CLIST_LINK
|
|
|
|
{
|
|
|
|
friend class CLIST_ITERATOR;
|
|
|
|
friend class CLIST;
|
|
|
|
|
|
|
|
CLIST_LINK *next;
|
|
|
|
void *data;
|
|
|
|
|
|
|
|
public:
|
|
|
|
CLIST_LINK() { //constructor
|
|
|
|
data = next = NULL;
|
|
|
|
}
|
|
|
|
|
2016-11-08 02:46:33 +08:00
|
|
|
CLIST_LINK( // copy constructor
|
|
|
|
const CLIST_LINK &) { // don't copy link
|
2007-03-08 04:03:40 +08:00
|
|
|
data = next = NULL;
|
|
|
|
}
|
|
|
|
|
2016-11-08 02:46:33 +08:00
|
|
|
void operator=( // don't copy links
|
|
|
|
const CLIST_LINK &) {
|
2007-03-08 04:03:40 +08:00
|
|
|
data = next = NULL;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
/**********************************************************************
|
|
|
|
* CLASS - CLIST
|
|
|
|
*
|
|
|
|
* Generic list class for singly linked CONS cell lists
|
|
|
|
**********************************************************************/
|
|
|
|
|
|
|
|
class DLLSYM CLIST
|
|
|
|
{
|
|
|
|
friend class CLIST_ITERATOR;
|
|
|
|
|
|
|
|
CLIST_LINK *last; //End of list
|
|
|
|
//(Points to head)
|
|
|
|
CLIST_LINK *First() { // return first
|
|
|
|
return last != NULL ? last->next : NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
public:
|
|
|
|
CLIST() { //constructor
|
|
|
|
last = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
~CLIST () { //destructor
|
|
|
|
shallow_clear();
|
|
|
|
}
|
|
|
|
|
|
|
|
void internal_deep_clear ( //destroy all links
|
|
|
|
void (*zapper) (void *)); //ptr to zapper functn
|
|
|
|
|
2016-11-08 02:46:33 +08:00
|
|
|
void shallow_clear(); // clear list but don't
|
|
|
|
// delete data elements
|
2007-03-08 04:03:40 +08:00
|
|
|
|
2010-11-24 02:34:14 +08:00
|
|
|
bool empty() const { //is list empty?
|
2007-03-08 04:03:40 +08:00
|
|
|
return !last;
|
|
|
|
}
|
|
|
|
|
2010-11-24 02:34:14 +08:00
|
|
|
bool singleton() const {
|
|
|
|
return last != NULL ? (last == last->next) : false;
|
2007-03-08 04:03:40 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void shallow_copy( //dangerous!!
|
|
|
|
CLIST *from_list) { //beware destructors!!
|
|
|
|
last = from_list->last;
|
|
|
|
}
|
|
|
|
|
|
|
|
void assign_to_sublist( //to this list
|
|
|
|
CLIST_ITERATOR *start_it, //from list start
|
|
|
|
CLIST_ITERATOR *end_it); //from list end
|
|
|
|
|
Use POSIX data types and macros (#878)
* api: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* ccmain: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* ccstruct: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* classify: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* cutil: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* dict: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* textord: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* training: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* wordrec: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* ccutil: Replace Tesseract data types by POSIX data types
Now all Tesseract data types which are no longer needed can be removed
from ccutil/host.h.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* ccmain: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* ccstruct: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* classify: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* dict: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* lstm: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* textord: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* wordrec: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* ccutil: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Remove the macros which are now unused from ccutil/host.h.
Remove also the obsolete history comments.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* Fix build error caused by ambiguous ClipToRange
Error message vom Appveyor CI:
C:\projects\tesseract\ccstruct\coutln.cpp(818): error C2672: 'ClipToRange': no matching overloaded function found [C:\projects\tesseract\build\libtesseract.vcxproj]
C:\projects\tesseract\ccstruct\coutln.cpp(818): error C2782: 'T ClipToRange(const T &,const T &,const T &)': template parameter 'T' is ambiguous [C:\projects\tesseract\build\libtesseract.vcxproj]
c:\projects\tesseract\ccutil\helpers.h(122): note: see declaration of 'ClipToRange'
C:\projects\tesseract\ccstruct\coutln.cpp(818): note: could be 'char'
C:\projects\tesseract\ccstruct\coutln.cpp(818): note: or 'int'
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* unittest: Replace Tesseract's MAX_INT8 by POSIX INT8_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* arch: Replace Tesseract's MAX_INT8 by POSIX INT8_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-03-14 04:36:30 +08:00
|
|
|
int32_t length() const; //# elements in list
|
2007-03-08 04:03:40 +08:00
|
|
|
|
|
|
|
void sort ( //sort elements
|
|
|
|
int comparator ( //comparison routine
|
|
|
|
const void *, const void *));
|
|
|
|
|
2008-12-31 02:15:44 +08:00
|
|
|
// Assuming list has been sorted already, insert new_data to
|
|
|
|
// keep the list sorted according to the same comparison function.
|
2015-09-15 04:09:18 +08:00
|
|
|
// Comparison function is the same as used by sort, i.e. uses double
|
2008-12-31 02:15:44 +08:00
|
|
|
// indirection. Time is O(1) to add to beginning or end.
|
|
|
|
// Time is linear to add pre-sorted items to an empty list.
|
|
|
|
// If unique, then don't add duplicate entries.
|
2010-11-24 02:34:14 +08:00
|
|
|
// Returns true if the element was added to the list.
|
|
|
|
bool add_sorted(int comparator(const void*, const void*),
|
2008-12-31 02:15:44 +08:00
|
|
|
bool unique, void* new_data);
|
|
|
|
|
2010-11-24 02:34:14 +08:00
|
|
|
// Assuming that the minuend and subtrahend are already sorted with
|
|
|
|
// the same comparison function, shallow clears this and then copies
|
|
|
|
// the set difference minuend - subtrahend to this, being the elements
|
|
|
|
// of minuend that do not compare equal to anything in subtrahend.
|
|
|
|
// If unique is true, any duplicates in minuend are also eliminated.
|
|
|
|
void set_subtract(int comparator(const void*, const void*), bool unique,
|
|
|
|
CLIST* minuend, CLIST* subtrahend);
|
|
|
|
|
2007-03-08 04:03:40 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
/***********************************************************************
|
2016-11-08 02:46:33 +08:00
|
|
|
* CLASS - CLIST_ITERATOR
|
2007-03-08 04:03:40 +08:00
|
|
|
*
|
2016-11-08 02:46:33 +08:00
|
|
|
* Generic iterator class for singly linked lists with embedded
|
|
|
|
*links
|
2007-03-08 04:03:40 +08:00
|
|
|
**********************************************************************/
|
|
|
|
|
|
|
|
class DLLSYM CLIST_ITERATOR
|
|
|
|
{
|
|
|
|
friend void CLIST::assign_to_sublist(CLIST_ITERATOR *, CLIST_ITERATOR *);
|
|
|
|
|
|
|
|
CLIST *list; //List being iterated
|
|
|
|
CLIST_LINK *prev; //prev element
|
|
|
|
CLIST_LINK *current; //current element
|
|
|
|
CLIST_LINK *next; //next element
|
2010-11-24 02:34:14 +08:00
|
|
|
BOOL8 ex_current_was_last; //current extracted
|
2007-03-08 04:03:40 +08:00
|
|
|
//was end of list
|
2010-11-24 02:34:14 +08:00
|
|
|
BOOL8 ex_current_was_cycle_pt; //current extracted
|
2007-03-08 04:03:40 +08:00
|
|
|
//was cycle point
|
|
|
|
CLIST_LINK *cycle_pt; //point we are cycling
|
|
|
|
//the list to.
|
2010-11-24 02:34:14 +08:00
|
|
|
BOOL8 started_cycling; //Have we moved off
|
2007-03-08 04:03:40 +08:00
|
|
|
//the start?
|
|
|
|
|
|
|
|
CLIST_LINK *extract_sublist( //from this current...
|
|
|
|
CLIST_ITERATOR *other_it); //to other current
|
|
|
|
|
|
|
|
public:
|
|
|
|
CLIST_ITERATOR() { //constructor
|
|
|
|
list = NULL;
|
|
|
|
} //unassigned list
|
|
|
|
|
|
|
|
CLIST_ITERATOR( //constructor
|
|
|
|
CLIST *list_to_iterate);
|
|
|
|
|
|
|
|
void set_to_list( //change list
|
|
|
|
CLIST *list_to_iterate);
|
|
|
|
|
|
|
|
void add_after_then_move( //add after current &
|
|
|
|
void *new_data); //move to new
|
|
|
|
|
|
|
|
void add_after_stay_put( //add after current &
|
|
|
|
void *new_data); //stay at current
|
|
|
|
|
|
|
|
void add_before_then_move( //add before current &
|
|
|
|
void *new_data); //move to new
|
|
|
|
|
|
|
|
void add_before_stay_put( //add before current &
|
|
|
|
void *new_data); //stay at current
|
|
|
|
|
|
|
|
void add_list_after( //add a list &
|
|
|
|
CLIST *list_to_add); //stay at current
|
|
|
|
|
|
|
|
void add_list_before( //add a list &
|
|
|
|
CLIST *list_to_add); //move to it 1st item
|
|
|
|
|
|
|
|
void *data() { //get current data
|
2008-12-31 02:15:44 +08:00
|
|
|
#ifndef NDEBUG
|
2007-03-08 04:03:40 +08:00
|
|
|
if (!list)
|
|
|
|
NO_LIST.error ("CLIST_ITERATOR::data", ABORT, NULL);
|
|
|
|
if (!current)
|
|
|
|
NULL_DATA.error ("CLIST_ITERATOR::data", ABORT, NULL);
|
|
|
|
#endif
|
|
|
|
return current->data;
|
|
|
|
}
|
|
|
|
|
|
|
|
void *data_relative( //get data + or - ...
|
Use POSIX data types and macros (#878)
* api: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* ccmain: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* ccstruct: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* classify: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* cutil: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* dict: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* textord: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* training: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* wordrec: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* ccutil: Replace Tesseract data types by POSIX data types
Now all Tesseract data types which are no longer needed can be removed
from ccutil/host.h.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* ccmain: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* ccstruct: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* classify: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* dict: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* lstm: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* textord: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* wordrec: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* ccutil: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Remove the macros which are now unused from ccutil/host.h.
Remove also the obsolete history comments.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* Fix build error caused by ambiguous ClipToRange
Error message vom Appveyor CI:
C:\projects\tesseract\ccstruct\coutln.cpp(818): error C2672: 'ClipToRange': no matching overloaded function found [C:\projects\tesseract\build\libtesseract.vcxproj]
C:\projects\tesseract\ccstruct\coutln.cpp(818): error C2782: 'T ClipToRange(const T &,const T &,const T &)': template parameter 'T' is ambiguous [C:\projects\tesseract\build\libtesseract.vcxproj]
c:\projects\tesseract\ccutil\helpers.h(122): note: see declaration of 'ClipToRange'
C:\projects\tesseract\ccstruct\coutln.cpp(818): note: could be 'char'
C:\projects\tesseract\ccstruct\coutln.cpp(818): note: or 'int'
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* unittest: Replace Tesseract's MAX_INT8 by POSIX INT8_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* arch: Replace Tesseract's MAX_INT8 by POSIX INT8_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-03-14 04:36:30 +08:00
|
|
|
int8_t offset); //offset from current
|
2007-03-08 04:03:40 +08:00
|
|
|
|
|
|
|
void *forward(); //move to next element
|
|
|
|
|
|
|
|
void *extract(); //remove from list
|
|
|
|
|
|
|
|
void *move_to_first(); //go to start of list
|
|
|
|
|
|
|
|
void *move_to_last(); //go to end of list
|
|
|
|
|
|
|
|
void mark_cycle_pt(); //remember current
|
|
|
|
|
2010-11-24 02:34:14 +08:00
|
|
|
BOOL8 empty() { //is list empty?
|
2008-12-31 02:15:44 +08:00
|
|
|
#ifndef NDEBUG
|
2007-03-08 04:03:40 +08:00
|
|
|
if (!list)
|
|
|
|
NO_LIST.error ("CLIST_ITERATOR::empty", ABORT, NULL);
|
|
|
|
#endif
|
|
|
|
return list->empty ();
|
|
|
|
}
|
|
|
|
|
2010-11-24 02:34:14 +08:00
|
|
|
BOOL8 current_extracted() { //current extracted?
|
2007-03-08 04:03:40 +08:00
|
|
|
return !current;
|
|
|
|
}
|
|
|
|
|
2010-11-24 02:34:14 +08:00
|
|
|
BOOL8 at_first(); //Current is first?
|
2007-03-08 04:03:40 +08:00
|
|
|
|
2010-11-24 02:34:14 +08:00
|
|
|
BOOL8 at_last(); //Current is last?
|
2007-03-08 04:03:40 +08:00
|
|
|
|
2010-11-24 02:34:14 +08:00
|
|
|
BOOL8 cycled_list(); //Completed a cycle?
|
2007-03-08 04:03:40 +08:00
|
|
|
|
2016-11-08 02:46:33 +08:00
|
|
|
void add_to_end( // add at end &
|
|
|
|
void *new_data); // don't move
|
2007-03-08 04:03:40 +08:00
|
|
|
|
|
|
|
void exchange( //positions of 2 links
|
|
|
|
CLIST_ITERATOR *other_it); //other iterator
|
|
|
|
|
Use POSIX data types and macros (#878)
* api: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* ccmain: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* ccstruct: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* classify: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* cutil: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* dict: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* textord: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* training: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* wordrec: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* ccutil: Replace Tesseract data types by POSIX data types
Now all Tesseract data types which are no longer needed can be removed
from ccutil/host.h.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* ccmain: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* ccstruct: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* classify: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* dict: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* lstm: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* textord: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* wordrec: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* ccutil: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Remove the macros which are now unused from ccutil/host.h.
Remove also the obsolete history comments.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* Fix build error caused by ambiguous ClipToRange
Error message vom Appveyor CI:
C:\projects\tesseract\ccstruct\coutln.cpp(818): error C2672: 'ClipToRange': no matching overloaded function found [C:\projects\tesseract\build\libtesseract.vcxproj]
C:\projects\tesseract\ccstruct\coutln.cpp(818): error C2782: 'T ClipToRange(const T &,const T &,const T &)': template parameter 'T' is ambiguous [C:\projects\tesseract\build\libtesseract.vcxproj]
c:\projects\tesseract\ccutil\helpers.h(122): note: see declaration of 'ClipToRange'
C:\projects\tesseract\ccstruct\coutln.cpp(818): note: could be 'char'
C:\projects\tesseract\ccstruct\coutln.cpp(818): note: or 'int'
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* unittest: Replace Tesseract's MAX_INT8 by POSIX INT8_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* arch: Replace Tesseract's MAX_INT8 by POSIX INT8_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-03-14 04:36:30 +08:00
|
|
|
int32_t length(); //# elements in list
|
2007-03-08 04:03:40 +08:00
|
|
|
|
|
|
|
void sort ( //sort elements
|
|
|
|
int comparator ( //comparison routine
|
|
|
|
const void *, const void *));
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
/***********************************************************************
|
2016-11-08 02:46:33 +08:00
|
|
|
* CLIST_ITERATOR::set_to_list
|
2007-03-08 04:03:40 +08:00
|
|
|
*
|
|
|
|
* (Re-)initialise the iterator to point to the start of the list_to_iterate
|
|
|
|
* over.
|
|
|
|
**********************************************************************/
|
|
|
|
|
|
|
|
inline void CLIST_ITERATOR::set_to_list( //change list
|
|
|
|
CLIST *list_to_iterate) {
|
2008-12-31 02:15:44 +08:00
|
|
|
#ifndef NDEBUG
|
2007-03-08 04:03:40 +08:00
|
|
|
if (!list_to_iterate)
|
|
|
|
BAD_PARAMETER.error ("CLIST_ITERATOR::set_to_list", ABORT,
|
|
|
|
"list_to_iterate is NULL");
|
|
|
|
#endif
|
|
|
|
|
|
|
|
list = list_to_iterate;
|
|
|
|
prev = list->last;
|
|
|
|
current = list->First ();
|
|
|
|
next = current != NULL ? current->next : NULL;
|
|
|
|
cycle_pt = NULL; //await explicit set
|
|
|
|
started_cycling = FALSE;
|
|
|
|
ex_current_was_last = FALSE;
|
|
|
|
ex_current_was_cycle_pt = FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
2016-11-08 02:46:33 +08:00
|
|
|
* CLIST_ITERATOR::CLIST_ITERATOR
|
2007-03-08 04:03:40 +08:00
|
|
|
*
|
|
|
|
* CONSTRUCTOR - set iterator to specified list;
|
|
|
|
**********************************************************************/
|
|
|
|
|
|
|
|
inline CLIST_ITERATOR::CLIST_ITERATOR(CLIST *list_to_iterate) {
|
|
|
|
set_to_list(list_to_iterate);
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
2016-11-08 02:46:33 +08:00
|
|
|
* CLIST_ITERATOR::add_after_then_move
|
2007-03-08 04:03:40 +08:00
|
|
|
*
|
|
|
|
* Add a new element to the list after the current element and move the
|
|
|
|
* iterator to the new element.
|
|
|
|
**********************************************************************/
|
|
|
|
|
|
|
|
inline void CLIST_ITERATOR::add_after_then_move( // element to add
|
|
|
|
void *new_data) {
|
|
|
|
CLIST_LINK *new_element;
|
|
|
|
|
2008-12-31 02:15:44 +08:00
|
|
|
#ifndef NDEBUG
|
2007-03-08 04:03:40 +08:00
|
|
|
if (!list)
|
|
|
|
NO_LIST.error ("CLIST_ITERATOR::add_after_then_move", ABORT, NULL);
|
|
|
|
if (!new_data)
|
|
|
|
BAD_PARAMETER.error ("CLIST_ITERATOR::add_after_then_move", ABORT,
|
|
|
|
"new_data is NULL");
|
|
|
|
#endif
|
|
|
|
|
|
|
|
new_element = new CLIST_LINK;
|
|
|
|
new_element->data = new_data;
|
|
|
|
|
|
|
|
if (list->empty ()) {
|
|
|
|
new_element->next = new_element;
|
|
|
|
list->last = new_element;
|
|
|
|
prev = next = new_element;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
new_element->next = next;
|
|
|
|
|
|
|
|
if (current) { //not extracted
|
|
|
|
current->next = new_element;
|
|
|
|
prev = current;
|
|
|
|
if (current == list->last)
|
|
|
|
list->last = new_element;
|
|
|
|
}
|
|
|
|
else { //current extracted
|
|
|
|
prev->next = new_element;
|
|
|
|
if (ex_current_was_last)
|
|
|
|
list->last = new_element;
|
|
|
|
if (ex_current_was_cycle_pt)
|
|
|
|
cycle_pt = new_element;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
current = new_element;
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
2016-11-08 02:46:33 +08:00
|
|
|
* CLIST_ITERATOR::add_after_stay_put
|
2007-03-08 04:03:40 +08:00
|
|
|
*
|
|
|
|
* Add a new element to the list after the current element but do not move
|
|
|
|
* the iterator to the new element.
|
|
|
|
**********************************************************************/
|
|
|
|
|
|
|
|
inline void CLIST_ITERATOR::add_after_stay_put( // element to add
|
|
|
|
void *new_data) {
|
|
|
|
CLIST_LINK *new_element;
|
|
|
|
|
2008-12-31 02:15:44 +08:00
|
|
|
#ifndef NDEBUG
|
2007-03-08 04:03:40 +08:00
|
|
|
if (!list)
|
|
|
|
NO_LIST.error ("CLIST_ITERATOR::add_after_stay_put", ABORT, NULL);
|
|
|
|
if (!new_data)
|
|
|
|
BAD_PARAMETER.error ("CLIST_ITERATOR::add_after_stay_put", ABORT,
|
|
|
|
"new_data is NULL");
|
|
|
|
#endif
|
|
|
|
|
|
|
|
new_element = new CLIST_LINK;
|
|
|
|
new_element->data = new_data;
|
|
|
|
|
|
|
|
if (list->empty ()) {
|
|
|
|
new_element->next = new_element;
|
|
|
|
list->last = new_element;
|
|
|
|
prev = next = new_element;
|
|
|
|
ex_current_was_last = FALSE;
|
|
|
|
current = NULL;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
new_element->next = next;
|
|
|
|
|
|
|
|
if (current) { //not extracted
|
|
|
|
current->next = new_element;
|
|
|
|
if (prev == current)
|
|
|
|
prev = new_element;
|
|
|
|
if (current == list->last)
|
|
|
|
list->last = new_element;
|
|
|
|
}
|
|
|
|
else { //current extracted
|
|
|
|
prev->next = new_element;
|
|
|
|
if (ex_current_was_last) {
|
|
|
|
list->last = new_element;
|
|
|
|
ex_current_was_last = FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
next = new_element;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
2016-11-08 02:46:33 +08:00
|
|
|
* CLIST_ITERATOR::add_before_then_move
|
2007-03-08 04:03:40 +08:00
|
|
|
*
|
|
|
|
* Add a new element to the list before the current element and move the
|
|
|
|
* iterator to the new element.
|
|
|
|
**********************************************************************/
|
|
|
|
|
|
|
|
inline void CLIST_ITERATOR::add_before_then_move( // element to add
|
|
|
|
void *new_data) {
|
|
|
|
CLIST_LINK *new_element;
|
|
|
|
|
2008-12-31 02:15:44 +08:00
|
|
|
#ifndef NDEBUG
|
2007-03-08 04:03:40 +08:00
|
|
|
if (!list)
|
|
|
|
NO_LIST.error ("CLIST_ITERATOR::add_before_then_move", ABORT, NULL);
|
|
|
|
if (!new_data)
|
|
|
|
BAD_PARAMETER.error ("CLIST_ITERATOR::add_before_then_move", ABORT,
|
|
|
|
"new_data is NULL");
|
|
|
|
#endif
|
|
|
|
|
|
|
|
new_element = new CLIST_LINK;
|
|
|
|
new_element->data = new_data;
|
|
|
|
|
|
|
|
if (list->empty ()) {
|
|
|
|
new_element->next = new_element;
|
|
|
|
list->last = new_element;
|
|
|
|
prev = next = new_element;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
prev->next = new_element;
|
|
|
|
if (current) { //not extracted
|
|
|
|
new_element->next = current;
|
|
|
|
next = current;
|
|
|
|
}
|
|
|
|
else { //current extracted
|
|
|
|
new_element->next = next;
|
|
|
|
if (ex_current_was_last)
|
|
|
|
list->last = new_element;
|
|
|
|
if (ex_current_was_cycle_pt)
|
|
|
|
cycle_pt = new_element;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
current = new_element;
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
2016-11-08 02:46:33 +08:00
|
|
|
* CLIST_ITERATOR::add_before_stay_put
|
2007-03-08 04:03:40 +08:00
|
|
|
*
|
2015-09-15 04:09:18 +08:00
|
|
|
* Add a new element to the list before the current element but don't move the
|
2007-03-08 04:03:40 +08:00
|
|
|
* iterator to the new element.
|
|
|
|
**********************************************************************/
|
|
|
|
|
|
|
|
inline void CLIST_ITERATOR::add_before_stay_put( // element to add
|
|
|
|
void *new_data) {
|
|
|
|
CLIST_LINK *new_element;
|
|
|
|
|
2008-12-31 02:15:44 +08:00
|
|
|
#ifndef NDEBUG
|
2007-03-08 04:03:40 +08:00
|
|
|
if (!list)
|
|
|
|
NO_LIST.error ("CLIST_ITERATOR::add_before_stay_put", ABORT, NULL);
|
|
|
|
if (!new_data)
|
|
|
|
BAD_PARAMETER.error ("CLIST_ITERATOR::add_before_stay_put", ABORT,
|
|
|
|
"new_data is NULL");
|
|
|
|
#endif
|
|
|
|
|
|
|
|
new_element = new CLIST_LINK;
|
|
|
|
new_element->data = new_data;
|
|
|
|
|
|
|
|
if (list->empty ()) {
|
|
|
|
new_element->next = new_element;
|
|
|
|
list->last = new_element;
|
|
|
|
prev = next = new_element;
|
|
|
|
ex_current_was_last = TRUE;
|
|
|
|
current = NULL;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
prev->next = new_element;
|
|
|
|
if (current) { //not extracted
|
|
|
|
new_element->next = current;
|
|
|
|
if (next == current)
|
|
|
|
next = new_element;
|
|
|
|
}
|
|
|
|
else { //current extracted
|
|
|
|
new_element->next = next;
|
|
|
|
if (ex_current_was_last)
|
|
|
|
list->last = new_element;
|
|
|
|
}
|
|
|
|
prev = new_element;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
2016-11-08 02:46:33 +08:00
|
|
|
* CLIST_ITERATOR::add_list_after
|
2007-03-08 04:03:40 +08:00
|
|
|
*
|
2016-11-08 02:46:33 +08:00
|
|
|
* Insert another list to this list after the current element but don't move
|
|
|
|
*the
|
2007-03-08 04:03:40 +08:00
|
|
|
* iterator.
|
|
|
|
**********************************************************************/
|
|
|
|
|
|
|
|
inline void CLIST_ITERATOR::add_list_after(CLIST *list_to_add) {
|
2008-12-31 02:15:44 +08:00
|
|
|
#ifndef NDEBUG
|
2007-03-08 04:03:40 +08:00
|
|
|
if (!list)
|
|
|
|
NO_LIST.error ("CLIST_ITERATOR::add_list_after", ABORT, NULL);
|
|
|
|
if (!list_to_add)
|
|
|
|
BAD_PARAMETER.error ("CLIST_ITERATOR::add_list_after", ABORT,
|
|
|
|
"list_to_add is NULL");
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (!list_to_add->empty ()) {
|
|
|
|
if (list->empty ()) {
|
|
|
|
list->last = list_to_add->last;
|
|
|
|
prev = list->last;
|
|
|
|
next = list->First ();
|
|
|
|
ex_current_was_last = TRUE;
|
|
|
|
current = NULL;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (current) { //not extracted
|
|
|
|
current->next = list_to_add->First ();
|
|
|
|
if (current == list->last)
|
|
|
|
list->last = list_to_add->last;
|
|
|
|
list_to_add->last->next = next;
|
|
|
|
next = current->next;
|
|
|
|
}
|
|
|
|
else { //current extracted
|
|
|
|
prev->next = list_to_add->First ();
|
|
|
|
if (ex_current_was_last) {
|
|
|
|
list->last = list_to_add->last;
|
|
|
|
ex_current_was_last = FALSE;
|
|
|
|
}
|
|
|
|
list_to_add->last->next = next;
|
|
|
|
next = prev->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
list_to_add->last = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
2016-11-08 02:46:33 +08:00
|
|
|
* CLIST_ITERATOR::add_list_before
|
2007-03-08 04:03:40 +08:00
|
|
|
*
|
|
|
|
* Insert another list to this list before the current element. Move the
|
|
|
|
* iterator to the start of the inserted elements
|
|
|
|
* iterator.
|
|
|
|
**********************************************************************/
|
|
|
|
|
|
|
|
inline void CLIST_ITERATOR::add_list_before(CLIST *list_to_add) {
|
2008-12-31 02:15:44 +08:00
|
|
|
#ifndef NDEBUG
|
2007-03-08 04:03:40 +08:00
|
|
|
if (!list)
|
|
|
|
NO_LIST.error ("CLIST_ITERATOR::add_list_before", ABORT, NULL);
|
|
|
|
if (!list_to_add)
|
|
|
|
BAD_PARAMETER.error ("CLIST_ITERATOR::add_list_before", ABORT,
|
|
|
|
"list_to_add is NULL");
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (!list_to_add->empty ()) {
|
|
|
|
if (list->empty ()) {
|
|
|
|
list->last = list_to_add->last;
|
|
|
|
prev = list->last;
|
|
|
|
current = list->First ();
|
|
|
|
next = current->next;
|
|
|
|
ex_current_was_last = FALSE;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
prev->next = list_to_add->First ();
|
|
|
|
if (current) { //not extracted
|
|
|
|
list_to_add->last->next = current;
|
|
|
|
}
|
|
|
|
else { //current extracted
|
|
|
|
list_to_add->last->next = next;
|
|
|
|
if (ex_current_was_last)
|
|
|
|
list->last = list_to_add->last;
|
|
|
|
if (ex_current_was_cycle_pt)
|
|
|
|
cycle_pt = prev->next;
|
|
|
|
}
|
|
|
|
current = prev->next;
|
|
|
|
next = current->next;
|
|
|
|
}
|
|
|
|
list_to_add->last = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
2016-11-08 02:46:33 +08:00
|
|
|
* CLIST_ITERATOR::extract
|
2007-03-08 04:03:40 +08:00
|
|
|
*
|
|
|
|
* Do extraction by removing current from the list, deleting the cons cell
|
|
|
|
* and returning the data to the caller, but NOT updating the iterator. (So
|
|
|
|
* that any calling loop can do this.) The iterator's current points to
|
|
|
|
* NULL. If the data is to be deleted, this is the callers responsibility.
|
|
|
|
**********************************************************************/
|
|
|
|
|
|
|
|
inline void *CLIST_ITERATOR::extract() {
|
|
|
|
void *extracted_data;
|
|
|
|
|
2008-12-31 02:15:44 +08:00
|
|
|
#ifndef NDEBUG
|
2007-03-08 04:03:40 +08:00
|
|
|
if (!list)
|
|
|
|
NO_LIST.error ("CLIST_ITERATOR::extract", ABORT, NULL);
|
|
|
|
if (!current) //list empty or
|
|
|
|
//element extracted
|
|
|
|
NULL_CURRENT.error ("CLIST_ITERATOR::extract",
|
|
|
|
ABORT, NULL);
|
|
|
|
#endif
|
|
|
|
|
2008-12-31 02:15:44 +08:00
|
|
|
if (list->singleton()) {
|
|
|
|
// Special case where we do need to change the iterator.
|
2007-03-08 04:03:40 +08:00
|
|
|
prev = next = list->last = NULL;
|
2008-12-31 02:15:44 +08:00
|
|
|
} else {
|
2007-03-08 04:03:40 +08:00
|
|
|
prev->next = next; //remove from list
|
|
|
|
|
|
|
|
if (current == list->last) {
|
|
|
|
list->last = prev;
|
|
|
|
ex_current_was_last = TRUE;
|
2008-12-31 02:15:44 +08:00
|
|
|
} else {
|
2007-03-08 04:03:40 +08:00
|
|
|
ex_current_was_last = FALSE;
|
2008-12-31 02:15:44 +08:00
|
|
|
}
|
2007-03-08 04:03:40 +08:00
|
|
|
}
|
2008-12-31 02:15:44 +08:00
|
|
|
// Always set ex_current_was_cycle_pt so an add/forward will work in a loop.
|
|
|
|
ex_current_was_cycle_pt = (current == cycle_pt) ? TRUE : FALSE;
|
2007-03-08 04:03:40 +08:00
|
|
|
extracted_data = current->data;
|
|
|
|
delete(current); //destroy CONS cell
|
|
|
|
current = NULL;
|
|
|
|
return extracted_data;
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
2016-11-08 02:46:33 +08:00
|
|
|
* CLIST_ITERATOR::move_to_first()
|
2007-03-08 04:03:40 +08:00
|
|
|
*
|
|
|
|
* Move current so that it is set to the start of the list.
|
|
|
|
* Return data just in case anyone wants it.
|
|
|
|
**********************************************************************/
|
|
|
|
|
|
|
|
inline void *CLIST_ITERATOR::move_to_first() {
|
2008-12-31 02:15:44 +08:00
|
|
|
#ifndef NDEBUG
|
2007-03-08 04:03:40 +08:00
|
|
|
if (!list)
|
|
|
|
NO_LIST.error ("CLIST_ITERATOR::move_to_first", ABORT, NULL);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
current = list->First ();
|
|
|
|
prev = list->last;
|
|
|
|
next = current != NULL ? current->next : NULL;
|
2009-06-03 06:11:51 +08:00
|
|
|
return current != NULL ? current->data : NULL;
|
2007-03-08 04:03:40 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
2016-11-08 02:46:33 +08:00
|
|
|
* CLIST_ITERATOR::mark_cycle_pt()
|
2007-03-08 04:03:40 +08:00
|
|
|
*
|
|
|
|
* Remember the current location so that we can tell whether we've returned
|
|
|
|
* to this point later.
|
|
|
|
*
|
|
|
|
* If the current point is deleted either now, or in the future, the cycle
|
|
|
|
* point will be set to the next item which is set to current. This could be
|
|
|
|
* by a forward, add_after_then_move or add_after_then_move.
|
|
|
|
**********************************************************************/
|
|
|
|
|
|
|
|
inline void CLIST_ITERATOR::mark_cycle_pt() {
|
2008-12-31 02:15:44 +08:00
|
|
|
#ifndef NDEBUG
|
2007-03-08 04:03:40 +08:00
|
|
|
if (!list)
|
|
|
|
NO_LIST.error ("CLIST_ITERATOR::mark_cycle_pt", ABORT, NULL);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (current)
|
|
|
|
cycle_pt = current;
|
|
|
|
else
|
|
|
|
ex_current_was_cycle_pt = TRUE;
|
|
|
|
started_cycling = FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
2016-11-08 02:46:33 +08:00
|
|
|
* CLIST_ITERATOR::at_first()
|
2007-03-08 04:03:40 +08:00
|
|
|
*
|
|
|
|
* Are we at the start of the list?
|
|
|
|
*
|
|
|
|
**********************************************************************/
|
|
|
|
|
2010-11-24 02:34:14 +08:00
|
|
|
inline BOOL8 CLIST_ITERATOR::at_first() {
|
2008-12-31 02:15:44 +08:00
|
|
|
#ifndef NDEBUG
|
2007-03-08 04:03:40 +08:00
|
|
|
if (!list)
|
|
|
|
NO_LIST.error ("CLIST_ITERATOR::at_first", ABORT, NULL);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
//we're at a deleted
|
|
|
|
return ((list->empty ()) || (current == list->First ()) || ((current == NULL) &&
|
|
|
|
(prev == list->last) && //NON-last pt between
|
|
|
|
!ex_current_was_last)); //first and last
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
2016-11-08 02:46:33 +08:00
|
|
|
* CLIST_ITERATOR::at_last()
|
2007-03-08 04:03:40 +08:00
|
|
|
*
|
|
|
|
* Are we at the end of the list?
|
|
|
|
*
|
|
|
|
**********************************************************************/
|
|
|
|
|
2010-11-24 02:34:14 +08:00
|
|
|
inline BOOL8 CLIST_ITERATOR::at_last() {
|
2008-12-31 02:15:44 +08:00
|
|
|
#ifndef NDEBUG
|
2007-03-08 04:03:40 +08:00
|
|
|
if (!list)
|
|
|
|
NO_LIST.error ("CLIST_ITERATOR::at_last", ABORT, NULL);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
//we're at a deleted
|
|
|
|
return ((list->empty ()) || (current == list->last) || ((current == NULL) &&
|
|
|
|
(prev == list->last) && //last point between
|
|
|
|
ex_current_was_last)); //first and last
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
2016-11-08 02:46:33 +08:00
|
|
|
* CLIST_ITERATOR::cycled_list()
|
2007-03-08 04:03:40 +08:00
|
|
|
*
|
|
|
|
* Have we returned to the cycle_pt since it was set?
|
|
|
|
*
|
|
|
|
**********************************************************************/
|
|
|
|
|
2010-11-24 02:34:14 +08:00
|
|
|
inline BOOL8 CLIST_ITERATOR::cycled_list() {
|
2008-12-31 02:15:44 +08:00
|
|
|
#ifndef NDEBUG
|
2007-03-08 04:03:40 +08:00
|
|
|
if (!list)
|
|
|
|
NO_LIST.error ("CLIST_ITERATOR::cycled_list", ABORT, NULL);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return ((list->empty ()) || ((current == cycle_pt) && started_cycling));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
2016-11-08 02:46:33 +08:00
|
|
|
* CLIST_ITERATOR::length()
|
2007-03-08 04:03:40 +08:00
|
|
|
*
|
|
|
|
* Return the length of the list
|
|
|
|
*
|
|
|
|
**********************************************************************/
|
|
|
|
|
Use POSIX data types and macros (#878)
* api: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* ccmain: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* ccstruct: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* classify: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* cutil: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* dict: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* textord: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* training: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* wordrec: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* ccutil: Replace Tesseract data types by POSIX data types
Now all Tesseract data types which are no longer needed can be removed
from ccutil/host.h.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* ccmain: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* ccstruct: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* classify: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* dict: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* lstm: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* textord: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* wordrec: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* ccutil: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Remove the macros which are now unused from ccutil/host.h.
Remove also the obsolete history comments.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* Fix build error caused by ambiguous ClipToRange
Error message vom Appveyor CI:
C:\projects\tesseract\ccstruct\coutln.cpp(818): error C2672: 'ClipToRange': no matching overloaded function found [C:\projects\tesseract\build\libtesseract.vcxproj]
C:\projects\tesseract\ccstruct\coutln.cpp(818): error C2782: 'T ClipToRange(const T &,const T &,const T &)': template parameter 'T' is ambiguous [C:\projects\tesseract\build\libtesseract.vcxproj]
c:\projects\tesseract\ccutil\helpers.h(122): note: see declaration of 'ClipToRange'
C:\projects\tesseract\ccstruct\coutln.cpp(818): note: could be 'char'
C:\projects\tesseract\ccstruct\coutln.cpp(818): note: or 'int'
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* unittest: Replace Tesseract's MAX_INT8 by POSIX INT8_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* arch: Replace Tesseract's MAX_INT8 by POSIX INT8_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-03-14 04:36:30 +08:00
|
|
|
inline int32_t CLIST_ITERATOR::length() {
|
2008-12-31 02:15:44 +08:00
|
|
|
#ifndef NDEBUG
|
2007-03-08 04:03:40 +08:00
|
|
|
if (!list)
|
|
|
|
NO_LIST.error ("CLIST_ITERATOR::length", ABORT, NULL);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return list->length ();
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
2016-11-08 02:46:33 +08:00
|
|
|
* CLIST_ITERATOR::sort()
|
2007-03-08 04:03:40 +08:00
|
|
|
*
|
|
|
|
* Sort the elements of the list, then reposition at the start.
|
|
|
|
*
|
|
|
|
**********************************************************************/
|
|
|
|
|
|
|
|
inline void
|
|
|
|
CLIST_ITERATOR::sort ( //sort elements
|
|
|
|
int comparator ( //comparison routine
|
|
|
|
const void *, const void *)) {
|
2008-12-31 02:15:44 +08:00
|
|
|
#ifndef NDEBUG
|
2007-03-08 04:03:40 +08:00
|
|
|
if (!list)
|
|
|
|
NO_LIST.error ("CLIST_ITERATOR::sort", ABORT, NULL);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
list->sort (comparator);
|
|
|
|
move_to_first();
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
2016-11-08 02:46:33 +08:00
|
|
|
* CLIST_ITERATOR::add_to_end
|
2007-03-08 04:03:40 +08:00
|
|
|
*
|
|
|
|
* Add a new element to the end of the list without moving the iterator.
|
|
|
|
* This is provided because a single linked list cannot move to the last as
|
|
|
|
* the iterator couldn't set its prev pointer. Adding to the end is
|
|
|
|
* essential for implementing
|
|
|
|
queues.
|
|
|
|
**********************************************************************/
|
|
|
|
|
|
|
|
inline void CLIST_ITERATOR::add_to_end( // element to add
|
|
|
|
void *new_data) {
|
|
|
|
CLIST_LINK *new_element;
|
|
|
|
|
2008-12-31 02:15:44 +08:00
|
|
|
#ifndef NDEBUG
|
2007-03-08 04:03:40 +08:00
|
|
|
if (!list)
|
|
|
|
NO_LIST.error ("CLIST_ITERATOR::add_to_end", ABORT, NULL);
|
|
|
|
if (!new_data)
|
|
|
|
BAD_PARAMETER.error ("CLIST_ITERATOR::add_to_end", ABORT,
|
|
|
|
"new_data is NULL");
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (this->at_last ()) {
|
|
|
|
this->add_after_stay_put (new_data);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (this->at_first ()) {
|
|
|
|
this->add_before_stay_put (new_data);
|
|
|
|
list->last = prev;
|
|
|
|
}
|
|
|
|
else { //Iteratr is elsewhere
|
|
|
|
new_element = new CLIST_LINK;
|
|
|
|
new_element->data = new_data;
|
|
|
|
|
|
|
|
new_element->next = list->last->next;
|
|
|
|
list->last->next = new_element;
|
|
|
|
list->last = new_element;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
QUOTE_IT MACRO DEFINITION
|
|
|
|
===========================
|
|
|
|
Replace <parm> with "<parm>". <parm> may be an arbitrary number of tokens
|
|
|
|
***********************************************************************/
|
|
|
|
|
|
|
|
#define QUOTE_IT( parm ) #parm
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
CLISTIZE( CLASSNAME ) MACRO DEFINITION
|
|
|
|
======================================
|
|
|
|
|
|
|
|
CLASSNAME is assumed to be the name of a class to be used in a CONS list
|
|
|
|
|
2015-09-15 04:09:18 +08:00
|
|
|
NOTE: Because we don't use virtual functions in the list code, the list code
|
2007-03-08 04:03:40 +08:00
|
|
|
will NOT work correctly for classes derived from this.
|
|
|
|
|
|
|
|
The macro generates:
|
|
|
|
- An element deletion function: CLASSNAME##_c1_zapper
|
|
|
|
- An element copier function:
|
|
|
|
CLASSNAME##_c1_copier
|
2016-11-08 02:46:33 +08:00
|
|
|
- A CLIST subclass: CLASSNAME##_CLIST
|
2007-03-08 04:03:40 +08:00
|
|
|
- A CLIST_ITERATOR subclass:
|
|
|
|
CLASSNAME##_C_IT
|
|
|
|
|
|
|
|
NOTE: Generated names do NOT clash with those generated by ELISTIZE,
|
|
|
|
ELIST2ISE and CLIST2IZE
|
|
|
|
|
2010-11-30 08:53:31 +08:00
|
|
|
Two macros are provided: CLISTIZE and CLISTIZEH
|
2007-03-08 04:03:40 +08:00
|
|
|
The ...IZEH macros just define the class names for use in .h files
|
|
|
|
The ...IZE macros define the code use in .c files
|
|
|
|
***********************************************************************/
|
|
|
|
|
|
|
|
/***********************************************************************
|
2010-11-30 08:53:31 +08:00
|
|
|
CLISTIZEH( CLASSNAME ) MACRO
|
2007-03-08 04:03:40 +08:00
|
|
|
|
2010-11-30 08:53:31 +08:00
|
|
|
CLISTIZEH is a concatenation of 3 fragments CLISTIZEH_A, CLISTIZEH_B and
|
|
|
|
CLISTIZEH_C.
|
2007-03-08 04:03:40 +08:00
|
|
|
***********************************************************************/
|
|
|
|
|
2016-11-08 02:46:33 +08:00
|
|
|
#define CLISTIZEH_A(CLASSNAME) \
|
|
|
|
\
|
|
|
|
extern DLLSYM void CLASSNAME##_c1_zapper( /*delete a link*/ \
|
|
|
|
void *link); /*link to delete*/ \
|
|
|
|
\
|
|
|
|
extern DLLSYM void \
|
|
|
|
*CLASSNAME##_c1_copier( /*deep copy a link*/ \
|
|
|
|
void *old_element); /*source link */
|
|
|
|
|
|
|
|
#define CLISTIZEH_B(CLASSNAME) \
|
|
|
|
\
|
|
|
|
/*********************************************************************** \
|
|
|
|
* CLASS - \
|
|
|
|
*CLASSNAME##_CLIST \
|
|
|
|
* \
|
|
|
|
* List class for class \
|
|
|
|
*CLASSNAME \
|
|
|
|
* \
|
|
|
|
**********************************************************************/ \
|
|
|
|
\
|
|
|
|
class DLLSYM CLASSNAME##_CLIST : public CLIST { \
|
|
|
|
public: \
|
|
|
|
CLASSNAME##_CLIST() : CLIST() {} \
|
|
|
|
/* constructor */ \
|
|
|
|
\
|
|
|
|
CLASSNAME##_CLIST( /* don't construct */ \
|
|
|
|
const CLASSNAME##_CLIST &) /*by initial assign*/ \
|
|
|
|
{ \
|
|
|
|
DONT_CONSTRUCT_LIST_BY_COPY.error(QUOTE_IT(CLASSNAME##_CLIST), ABORT, \
|
|
|
|
NULL); \
|
|
|
|
} \
|
|
|
|
\
|
|
|
|
void deep_clear() /* delete elements */ \
|
|
|
|
{ \
|
|
|
|
CLIST::internal_deep_clear(&CLASSNAME##_c1_zapper); \
|
|
|
|
} \
|
|
|
|
\
|
|
|
|
void operator=(/* prevent assign */ \
|
|
|
|
const CLASSNAME##_CLIST &) { \
|
|
|
|
DONT_ASSIGN_LISTS.error(QUOTE_IT(CLASSNAME##_CLIST), ABORT, NULL); \
|
|
|
|
}
|
2007-03-08 04:03:40 +08:00
|
|
|
|
2016-11-08 02:46:33 +08:00
|
|
|
#define CLISTIZEH_C(CLASSNAME) \
|
|
|
|
} \
|
|
|
|
; \
|
|
|
|
\
|
|
|
|
/*********************************************************************** \
|
|
|
|
* CLASS - CLASSNAME##_C_IT \
|
|
|
|
* \
|
|
|
|
* Iterator class for class CLASSNAME##_CLIST \
|
|
|
|
* \
|
|
|
|
* Note: We don't need to coerce pointers to member functions input \
|
|
|
|
* parameters as these are automatically converted to the type of the base \
|
|
|
|
* type. ("A ptr to a class may be converted to a pointer to a public base \
|
|
|
|
* class of that class") \
|
|
|
|
**********************************************************************/ \
|
|
|
|
\
|
|
|
|
class DLLSYM CLASSNAME##_C_IT : public CLIST_ITERATOR { \
|
|
|
|
public: \
|
|
|
|
CLASSNAME##_C_IT() : CLIST_ITERATOR() {} \
|
|
|
|
\
|
|
|
|
CLASSNAME##_C_IT(CLASSNAME##_CLIST *list) : CLIST_ITERATOR(list) {} \
|
|
|
|
\
|
|
|
|
CLASSNAME *data() { return (CLASSNAME *)CLIST_ITERATOR::data(); } \
|
|
|
|
\
|
Use POSIX data types and macros (#878)
* api: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* ccmain: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* ccstruct: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* classify: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* cutil: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* dict: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* textord: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* training: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* wordrec: Replace Tesseract data types by POSIX data types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* ccutil: Replace Tesseract data types by POSIX data types
Now all Tesseract data types which are no longer needed can be removed
from ccutil/host.h.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* ccmain: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* ccstruct: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* classify: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* dict: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* lstm: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* textord: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* wordrec: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* ccutil: Replace Tesseract's MIN_*INT, MAX_*INT* by POSIX *INT*_MIN, *INT*_MAX
Remove the macros which are now unused from ccutil/host.h.
Remove also the obsolete history comments.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* Fix build error caused by ambiguous ClipToRange
Error message vom Appveyor CI:
C:\projects\tesseract\ccstruct\coutln.cpp(818): error C2672: 'ClipToRange': no matching overloaded function found [C:\projects\tesseract\build\libtesseract.vcxproj]
C:\projects\tesseract\ccstruct\coutln.cpp(818): error C2782: 'T ClipToRange(const T &,const T &,const T &)': template parameter 'T' is ambiguous [C:\projects\tesseract\build\libtesseract.vcxproj]
c:\projects\tesseract\ccutil\helpers.h(122): note: see declaration of 'ClipToRange'
C:\projects\tesseract\ccstruct\coutln.cpp(818): note: could be 'char'
C:\projects\tesseract\ccstruct\coutln.cpp(818): note: or 'int'
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* unittest: Replace Tesseract's MAX_INT8 by POSIX INT8_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
* arch: Replace Tesseract's MAX_INT8 by POSIX INT8_MAX
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-03-14 04:36:30 +08:00
|
|
|
CLASSNAME *data_relative(int8_t offset) { \
|
2016-11-08 02:46:33 +08:00
|
|
|
return (CLASSNAME *)CLIST_ITERATOR::data_relative(offset); \
|
|
|
|
} \
|
|
|
|
\
|
|
|
|
CLASSNAME *forward() { return (CLASSNAME *)CLIST_ITERATOR::forward(); } \
|
|
|
|
\
|
|
|
|
CLASSNAME *extract() { return (CLASSNAME *)CLIST_ITERATOR::extract(); } \
|
|
|
|
\
|
|
|
|
CLASSNAME *move_to_first() { \
|
|
|
|
return (CLASSNAME *)CLIST_ITERATOR::move_to_first(); \
|
|
|
|
} \
|
|
|
|
\
|
|
|
|
CLASSNAME *move_to_last() { \
|
|
|
|
return (CLASSNAME *)CLIST_ITERATOR::move_to_last(); \
|
|
|
|
} \
|
|
|
|
};
|
|
|
|
|
|
|
|
#define CLISTIZEH(CLASSNAME) \
|
|
|
|
\
|
|
|
|
CLISTIZEH_A(CLASSNAME) \
|
|
|
|
\
|
|
|
|
CLISTIZEH_B(CLASSNAME) \
|
|
|
|
\
|
|
|
|
CLISTIZEH_C(CLASSNAME)
|
2007-03-08 04:03:40 +08:00
|
|
|
|
|
|
|
/***********************************************************************
|
2010-11-30 08:53:31 +08:00
|
|
|
CLISTIZE( CLASSNAME ) MACRO
|
2007-03-08 04:03:40 +08:00
|
|
|
***********************************************************************/
|
|
|
|
|
2016-11-08 02:46:33 +08:00
|
|
|
#define CLISTIZE(CLASSNAME) \
|
|
|
|
\
|
|
|
|
/*********************************************************************** \
|
|
|
|
* CLASSNAME##_c1_zapper \
|
|
|
|
* \
|
|
|
|
* A function which can delete a CLASSNAME element. This is passed to the \
|
|
|
|
* generic deep_clear list member function so that when a list is cleared \
|
|
|
|
*the \
|
|
|
|
* elements on the list are properly destroyed from the base class, even \
|
|
|
|
* though we don't use a virtual destructor function. \
|
|
|
|
**********************************************************************/ \
|
|
|
|
\
|
|
|
|
DLLSYM void CLASSNAME##_c1_zapper( /*delete a link*/ \
|
|
|
|
void *link) /*link to delete*/ \
|
|
|
|
{ \
|
|
|
|
delete (CLASSNAME *)link; \
|
|
|
|
}
|
2007-03-08 04:03:40 +08:00
|
|
|
|
|
|
|
#endif
|