1 files changed, 0 insertions, 142 deletions
diff --git a/src/regexengine.h b/src/regexengine.h
deleted file mode 100644
index ec181c1..0000000
--- a/src/regexengine.h
+++ /dev/null
@@ -1,142 +0,0 @@
-#ifndef BU_REG_EX_ENGINE_H
-#define BU_REG_EX_ENGINE_H
-#include "bu/sharedcore.h"
-#include "bu/array.h"
-#include "bu/sio.h"
-namespace Bu
-{
-        template<typename chr> class RegExEngine;
-        template<typename chr>
-        class RegExEngineCore
-        {
-        friend class RegExEngine<chr>;
-        friend class SharedCore<RegExEngine<chr>, RegExEngineCore<chr> >;
-        private:
-                RegExEngineCore()
-                {
-                }
-                virtual ~RegExEngineCore()
-                {
-                }
-                class Range
-                {
-                public:
-                        Range( chr cLower, chr cUpper, int iTrgState ) :
-                                cLower( cLower ), cUpper( cUpper ), iTrgState( iTrgState )
-                        {
-                        }
-                
-                        chr cLower;
-                        chr cUpper;
-                        int iTrgState;
-                };
-                class State
-                {
-                public:
-                        Bu::Array<Range> aRange;
-                };
-                int addState()
-                {
-                        aState.append( State() );
-                        return aState.getSize()-1;
-                }
-                void addCompletion( int iState, chr cLower, chr cUpper, int iTrgState )
-                {
-                        aState[iState].aRange.append( Range( cLower, cUpper, iTrgState ) );
-                }
-                template<typename str>
-                bool match( const str &sIn, int &iSize, int &iCompletion )
-                {
-                        bool bMatch;
-                        int iState = 0;
-                        iSize = 0;
-                        for( typename str::const_iterator i = sIn.begin(); i; i++ )
-                        {
-                                Bu::sio << "Finding char " << *i << " in state " << iState
-                                        << ":" << Bu::sio.nl;
-                                bMatch = false;
-                                for( typename Bu::Array<Range>::iterator j =
-                                         aState[iState].aRange.begin(); j; j++ )
-                                {
-                                        Bu::sio << "    Testing range " << (*j).cLower << " - " << (*j).cUpper << Bu::sio.nl;
-                                        if( *i >= (*j).cLower && *i <= (*j).cUpper )
-                                        {
-                                                iState = (*j).iTrgState;
-                                                bMatch = true;
-                                                iSize++;
-                                                if( iState < 0 )
-                                                {
-                                                        iCompletion = iState;
-                                                        return true;
-                                                }
-                                        }
-                                }
-                                if( bMatch == false )
-                                {
-                                        return false;
-                                }
-                        }
-                        iCompletion = 0;
-                        return true;
-                }
-                typedef Bu::Array<State> StateArray;
-                StateArray aState;
-        };
-        template<typename chr>
-        class RegExEngine : public SharedCore<RegExEngine<chr>,
-                                                RegExEngineCore<chr> >
-        {
-        private:
-                typedef class RegExEngine<chr> MyType;
-                typedef class RegExEngineCore<chr> Core;
-                typedef class Core::Range Range;
-                typedef class Core::State State;
-        
-        protected:
-                using SharedCore<MyType, Core>::core;
-                using SharedCore<MyType, Core>::_hardCopy;
-                using SharedCore<MyType, Core>::_resetCore;
-                using SharedCore<MyType, Core>::_allocateCore;
-        public:
-                RegExEngine()
-                {
-                }
-                virtual ~RegExEngine()
-                {
-                }
-                int addState()
-                {
-                        return core->addState();
-                }
-                void addCompletion( int iState, chr cLower, chr cUpper, int iTrgState )
-                {
-                        core->addCompletion( iState, cLower, cUpper, iTrgState );
-                }
-                template<typename str>
-                bool match( const str &sIn, int &iSize, int &iCompletion )
-                {
-                        return core->match( sIn, iSize, iCompletion );
-                }
-        private:
-        };
-};
-#endif

diff --git a/src/regexengine.h b/src/regexengine.h deleted file mode 100644 index ec181c1..0000000 --- a/src/regexengine.h +++ /dev/null
@@ -1,142 +0,0 @@
1	#ifndef BU_REG_EX_ENGINE_H
2	#define BU_REG_EX_ENGINE_H
3
4	#include "bu/sharedcore.h"
5	#include "bu/array.h"
6	#include "bu/sio.h"
7
8	namespace Bu
9	{
10	template<typename chr> class RegExEngine;
11
12	template<typename chr>
13	class RegExEngineCore
14	{
15	friend class RegExEngine<chr>;
16	friend class SharedCore<RegExEngine<chr>, RegExEngineCore<chr> >;
17	private:
18	RegExEngineCore()
19	{
20	}
21
22	virtual ~RegExEngineCore()
23	{
24	}
25
26	class Range
27	{
28	public:
29	Range( chr cLower, chr cUpper, int iTrgState ) :
30	cLower( cLower ), cUpper( cUpper ), iTrgState( iTrgState )
31	{
32	}
33
34	chr cLower;
35	chr cUpper;
36	int iTrgState;
37	};
38
39	class State
40	{
41	public:
42	Bu::Array<Range> aRange;
43	};
44
45	int addState()
46	{
47	aState.append( State() );
48	return aState.getSize()-1;
49	}
50
51	void addCompletion( int iState, chr cLower, chr cUpper, int iTrgState )
52	{
53	aState[iState].aRange.append( Range( cLower, cUpper, iTrgState ) );
54	}
55
56	template<typename str>
57	bool match( const str &sIn, int &iSize, int &iCompletion )
58	{
59	bool bMatch;
60	int iState = 0;
61	iSize = 0;
62	for( typename str::const_iterator i = sIn.begin(); i; i++ )
63	{
64	Bu::sio << "Finding char " << *i << " in state " << iState
65	<< ":" << Bu::sio.nl;
66	bMatch = false;
67	for( typename Bu::Array<Range>::iterator j =
68	aState[iState].aRange.begin(); j; j++ )
69	{
70	Bu::sio << " Testing range " << (j).cLower << " - " << (j).cUpper << Bu::sio.nl;
71	if( i >= (j).cLower && i <= (j).cUpper )
72	{
73	iState = (*j).iTrgState;
74	bMatch = true;
75	iSize++;
76	if( iState < 0 )
77	{
78	iCompletion = iState;
79	return true;
80	}
81	}
82	}
83	if( bMatch == false )
84	{
85	return false;
86	}
87	}
88
89	iCompletion = 0;
90	return true;
91	}
92
93	typedef Bu::Array<State> StateArray;
94	StateArray aState;
95	};
96
97	template<typename chr>
98	class RegExEngine : public SharedCore<RegExEngine<chr>,
99	RegExEngineCore<chr> >
100	{
101	private:
102	typedef class RegExEngine<chr> MyType;
103	typedef class RegExEngineCore<chr> Core;
104	typedef class Core::Range Range;
105	typedef class Core::State State;
106
107	protected:
108	using SharedCore<MyType, Core>::core;
109	using SharedCore<MyType, Core>::_hardCopy;
110	using SharedCore<MyType, Core>::_resetCore;
111	using SharedCore<MyType, Core>::_allocateCore;
112
113	public:
114	RegExEngine()
115	{
116	}
117
118	virtual ~RegExEngine()
119	{
120	}
121
122	int addState()
123	{
124	return core->addState();
125	}
126
127	void addCompletion( int iState, chr cLower, chr cUpper, int iTrgState )
128	{
129	core->addCompletion( iState, cLower, cUpper, iTrgState );
130	}
131
132	template<typename str>
133	bool match( const str &sIn, int &iSize, int &iCompletion )
134	{
135	return core->match( sIn, iSize, iCompletion );
136	}
137
138	private:
139	};
140	};
141
142	#endif