Merge ELAM

diff --cc elam/.gitignore
index 0000000,0000000..ae930bd
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/elam/.gitignore
@@@ -1,0 -1,0 +1,12 @@@
++libelam.*
++Makefile*
++.ctmp
++*~
++doc/source/
++*.o
++*.obj
++tests/parser/parsertest
++tests/eval/evaltest
++moc_*
++object_script.*
++*.prl

diff --cc elam/COPYING
index 0000000,4432540..4432540
mode 000000,100644..100644
--- /dev/null
--- 2/COPYING
+++ b/elam/COPYING

diff --cc elam/COPYING.LGPL
index 0000000,fc8a5de..fc8a5de
mode 000000,100644..100644
--- /dev/null
--- 2/COPYING.LGPL
+++ b/elam/COPYING.LGPL

diff --cc elam/README
index 0000000,0000000..7e32ef8
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/elam/README
@@@ -1,0 -1,0 +1,16 @@@
++README for ELAM
++================
++
++ELAM = Elementary Logic and Arithmetic Machine
++
++(c) Konrad Rosenbaum, 2010-2012
++protected under the GNU LGPL version 3 or at your option any newer
++see COPYING(.LGPL) for details
++
++This engine can be fed simple arithmetic formulas and will calculate their
++result, similar to those used in languages like C or Pascal. It is not able
++to solve algebraic systems or use fancy expressions.
++
++ELAM is based on and made for Qt 4.x.
++
++See the documentation for details. Just point your browser at doc/index.html.

diff --cc elam/TODO
index 0000000,86a3d76..86a3d76
mode 000000,100644..100644
--- /dev/null
--- 2/TODO
+++ b/elam/TODO

diff --cc elam/demo/demo.cpp
index 0000000,44fe86a..44fe86a
mode 000000,100644..100644
--- /dev/null
--- 2/demo/demo.cpp
+++ b/elam/demo/demo.cpp

diff --cc elam/demo/demo.h
index 0000000,df030fd..df030fd
mode 000000,100644..100644
--- /dev/null
--- 2/demo/demo.h
+++ b/elam/demo/demo.h

diff --cc elam/demo/demo.pro
index 0000000,d30e797..d30e797
mode 000000,100644..100644
--- /dev/null
--- 2/demo/demo.pro
+++ b/elam/demo/demo.pro

diff --cc elam/doc/build.html
index 0000000,6f534c0..6f534c0
mode 000000,100644..100644
--- /dev/null
--- 2/doc/build.html
+++ b/elam/doc/build.html

diff --cc elam/doc/gplv3.html
index 0000000,d64890f..d64890f
mode 000000,100644..100644
--- /dev/null
--- 2/doc/gplv3.html
+++ b/elam/doc/gplv3.html

diff --cc elam/doc/index.html
index 0000000,3810a33..3810a33
mode 000000,100644..100644
--- /dev/null
--- 2/doc/index.html
+++ b/elam/doc/index.html

diff --cc elam/doc/lgplv3.html
index 0000000,d2add1d..d2add1d
mode 000000,100644..100644
--- /dev/null
--- 2/doc/lgplv3.html
+++ b/elam/doc/lgplv3.html

diff --cc elam/doc/library.html
index 0000000,46db21e..46db21e
mode 000000,100644..100644
--- /dev/null
--- 2/doc/library.html
+++ b/elam/doc/library.html

diff --cc elam/doc/syntax.html
index 0000000,d34bcd5..d34bcd5
mode 000000,100644..100644
--- /dev/null
--- 2/doc/syntax.html
+++ b/elam/doc/syntax.html

diff --cc elam/dptr/.gitignore
index 0000000,c14c196..c14c196
mode 000000,100644..100644
--- /dev/null
--- 2/dptr/.gitignore
+++ b/elam/dptr/.gitignore

diff --cc elam/dptr/DPtr
index 0000000,c97a36a..c97a36a
mode 000000,100644..100644
--- /dev/null
--- 2/dptr/DPtr
+++ b/elam/dptr/DPtr

diff --cc elam/dptr/DPtrBase
index 0000000,12768d6..12768d6
mode 000000,100644..100644
--- /dev/null
--- 2/dptr/DPtrBase
+++ b/elam/dptr/DPtrBase

diff --cc elam/dptr/Doxyfile
index 0000000,1674663..1674663
mode 000000,100644..100644
--- /dev/null
--- 2/dptr/Doxyfile
+++ b/elam/dptr/Doxyfile

diff --cc elam/dptr/NonCopyDPtr
index 0000000,0af5e98..0af5e98
mode 000000,100644..100644
--- /dev/null
--- 2/dptr/NonCopyDPtr
+++ b/elam/dptr/NonCopyDPtr

diff --cc elam/dptr/README
index 0000000,129ef7f..129ef7f
mode 000000,100644..100644
--- /dev/null
--- 2/dptr/README
+++ b/elam/dptr/README

diff --cc elam/dptr/SharedDPtr
index 0000000,0883704..0883704
mode 000000,100644..100644
--- /dev/null
--- 2/dptr/SharedDPtr
+++ b/elam/dptr/SharedDPtr

diff --cc elam/dptr/dptr.dox
index 0000000,9a2f16d..9a2f16d
mode 000000,100644..100644
--- /dev/null
--- 2/dptr/dptr.dox
+++ b/elam/dptr/dptr.dox

diff --cc elam/dptr/dptr.h
index 0000000,121aaa4..121aaa4
mode 000000,100644..100644
--- /dev/null
--- 2/dptr/dptr.h
+++ b/elam/dptr/dptr.h

diff --cc elam/dptr/dptr_base.h
index 0000000,fde8265..fde8265
mode 000000,100644..100644
--- /dev/null
--- 2/dptr/dptr_base.h
+++ b/elam/dptr/dptr_base.h

diff --cc elam/dptr/dptr_noncopy.h
index 0000000,ed5ab7d..ed5ab7d
mode 000000,100644..100644
--- /dev/null
--- 2/dptr/dptr_noncopy.h
+++ b/elam/dptr/dptr_noncopy.h

diff --cc elam/dptr/dptr_shared.h
index 0000000,88dc7a4..88dc7a4
mode 000000,100644..100644
--- /dev/null
--- 2/dptr/dptr_shared.h
+++ b/elam/dptr/dptr_shared.h

diff --cc elam/dptr/tests/README
index 0000000,a4cc97c..a4cc97c
mode 000000,100644..100644
--- /dev/null
--- 2/dptr/tests/README
+++ b/elam/dptr/tests/README

diff --cc elam/dptr/tests/dptrpriv.cpp
index 0000000,8242456..8242456
mode 000000,100644..100644
--- /dev/null
--- 2/dptr/tests/dptrpriv.cpp
+++ b/elam/dptr/tests/dptrpriv.cpp

diff --cc elam/dptr/tests/dptrtest.cpp
index 0000000,9151f7d..9151f7d
mode 000000,100644..100644
--- /dev/null
--- 2/dptr/tests/dptrtest.cpp
+++ b/elam/dptr/tests/dptrtest.cpp

diff --cc elam/dptr/tests/dptrtest.h
index 0000000,67d4152..67d4152
mode 000000,100644..100644
--- /dev/null
--- 2/dptr/tests/dptrtest.h
+++ b/elam/dptr/tests/dptrtest.h

diff --cc elam/dptr/tests/dptrtest.pro
index 0000000,50460d7..50460d7
mode 000000,100644..100644
--- /dev/null
--- 2/dptr/tests/dptrtest.pro
+++ b/elam/dptr/tests/dptrtest.pro

diff --cc elam/include/ELAM/AnyType
index 0000000,5fcdb6e..5fcdb6e
mode 000000,100644..100644
--- /dev/null
--- 2/include/ELAM/AnyType
+++ b/elam/include/ELAM/AnyType

diff --cc elam/include/ELAM/BinaryOperator
index 0000000,9105013..9105013
mode 000000,100644..100644
--- /dev/null
--- 2/include/ELAM/BinaryOperator
+++ b/elam/include/ELAM/BinaryOperator

diff --cc elam/include/ELAM/BoolEngine
index 0000000,cc9401d..cc9401d
mode 000000,100644..100644
--- /dev/null
--- 2/include/ELAM/BoolEngine
+++ b/elam/include/ELAM/BoolEngine

diff --cc elam/include/ELAM/CharacterClassSettings
index 0000000,4d4b633..4d4b633
mode 000000,100644..100644
--- /dev/null
--- 2/include/ELAM/CharacterClassSettings
+++ b/elam/include/ELAM/CharacterClassSettings

diff --cc elam/include/ELAM/Engine
index 0000000,bea5477..bea5477
mode 000000,100644..100644
--- /dev/null
--- 2/include/ELAM/Engine
+++ b/elam/include/ELAM/Engine

diff --cc elam/include/ELAM/Exception
index 0000000,5fcdb6e..5fcdb6e
mode 000000,100644..100644
--- /dev/null
--- 2/include/ELAM/AnyType
+++ b/elam/include/ELAM/Exception

diff --cc elam/include/ELAM/Expression
index 0000000,c46a659..c46a659
mode 000000,100644..100644
--- /dev/null
--- 2/include/ELAM/Expression
+++ b/elam/include/ELAM/Expression

diff --cc elam/include/ELAM/FloatEngine
index 0000000,0e25e64..0e25e64
mode 000000,100644..100644
--- /dev/null
--- 2/include/ELAM/FloatEngine
+++ b/elam/include/ELAM/FloatEngine

diff --cc elam/include/ELAM/IntEngine
index 0000000,147f580..147f580
mode 000000,100644..100644
--- /dev/null
--- 2/include/ELAM/IntEngine
+++ b/elam/include/ELAM/IntEngine

diff --cc elam/include/ELAM/IntFloatEngine
index 0000000,0e25e64..0e25e64
mode 000000,100644..100644
--- /dev/null
--- 2/include/ELAM/FloatEngine
+++ b/elam/include/ELAM/IntFloatEngine

diff --cc elam/include/ELAM/Position
index 0000000,5fcdb6e..5fcdb6e
mode 000000,100644..100644
--- /dev/null
--- 2/include/ELAM/AnyType
+++ b/elam/include/ELAM/Position

diff --cc elam/include/ELAM/StringEngine
index 0000000,fceaf33..fceaf33
mode 000000,100644..100644
--- /dev/null
--- 2/include/ELAM/StringEngine
+++ b/elam/include/ELAM/StringEngine

diff --cc elam/include/ELAM/Token
index 0000000,c46a659..c46a659
mode 000000,100644..100644
--- /dev/null
--- 2/include/ELAM/Expression
+++ b/elam/include/ELAM/Token

diff --cc elam/include/ELAM/UnaryOperator
index 0000000,dcdf78b..dcdf78b
mode 000000,100644..100644
--- /dev/null
--- 2/include/ELAM/UnaryOperator
+++ b/elam/include/ELAM/UnaryOperator

diff --cc elam/include/elam.h
index 0000000,b1017c9..b1017c9
mode 000000,100644..100644
--- /dev/null
--- 2/include/elam.h
+++ b/elam/include/elam.h

diff --cc elam/include/elambinary.h
index 0000000,f18124c..f18124c
mode 000000,100644..100644
--- /dev/null
--- 2/include/elambinary.h
+++ b/elam/include/elambinary.h

diff --cc elam/include/elamboolengine.h
index 0000000,d74fc21..d74fc21
mode 000000,100644..100644
--- /dev/null
--- 2/include/elamboolengine.h
+++ b/elam/include/elamboolengine.h

diff --cc elam/include/elamcharclass.h
index 0000000,bda9fd8..bda9fd8
mode 000000,100644..100644
--- /dev/null
--- 2/include/elamcharclass.h
+++ b/elam/include/elamcharclass.h

diff --cc elam/include/elamengine.h
index 0000000,35e9054..35e9054
mode 000000,100644..100644
--- /dev/null
--- 2/include/elamengine.h
+++ b/elam/include/elamengine.h

diff --cc elam/include/elamexpression.h
index 0000000,2311fbf..2311fbf
mode 000000,100644..100644
--- /dev/null
--- 2/include/elamexpression.h
+++ b/elam/include/elamexpression.h

diff --cc elam/include/elamfloatengine.h
index 0000000,0a5c133..0a5c133
mode 000000,100644..100644
--- /dev/null
--- 2/include/elamfloatengine.h
+++ b/elam/include/elamfloatengine.h

diff --cc elam/include/elamglobal.h
index 0000000,0f7f4d4..0f7f4d4
mode 000000,100644..100644
--- /dev/null
--- 2/include/elamglobal.h
+++ b/elam/include/elamglobal.h

diff --cc elam/include/elamintengine.h
index 0000000,5f7acc4..5f7acc4
mode 000000,100644..100644
--- /dev/null
--- 2/include/elamintengine.h
+++ b/elam/include/elamintengine.h

diff --cc elam/include/elamstringengine.h
index 0000000,931cf39..931cf39
mode 000000,100644..100644
--- /dev/null
--- 2/include/elamstringengine.h
+++ b/elam/include/elamstringengine.h

diff --cc elam/include/elamunary.h
index 0000000,79561d7..79561d7
mode 000000,100644..100644
--- /dev/null
--- 2/include/elamunary.h
+++ b/elam/include/elamunary.h

diff --cc elam/include/elamvalue.h
index 0000000,7ebcc94..7ebcc94
mode 000000,100644..100644
--- /dev/null
--- 2/include/elamvalue.h
+++ b/elam/include/elamvalue.h

diff --cc elam/src/Doxyfile
index 0000000,68a7a23..68a7a23
mode 000000,100644..100644
--- /dev/null
--- 2/src/Doxyfile
+++ b/elam/src/Doxyfile

diff --cc elam/src/elam.pro
index 0000000,a717937..a717937
mode 000000,100644..100644
--- /dev/null
--- 2/src/elam.pro
+++ b/elam/src/elam.pro

diff --cc elam/src/elambinary.cpp
index 0000000,4db88c2..4db88c2
mode 000000,100644..100644
--- /dev/null
--- 2/src/elambinary.cpp
+++ b/elam/src/elambinary.cpp

diff --cc elam/src/elamboolengine.cpp
index 0000000,02f5fd2..02f5fd2
mode 000000,100644..100644
--- /dev/null
--- 2/src/elamboolengine.cpp
+++ b/elam/src/elamboolengine.cpp

diff --cc elam/src/elamcharclass.cpp
index 0000000,f67dfc4..f67dfc4
mode 000000,100644..100644
--- /dev/null
--- 2/src/elamcharclass.cpp
+++ b/elam/src/elamcharclass.cpp

diff --cc elam/src/elamengine.cpp
index 0000000,9b5a7d4..9b5a7d4
mode 000000,100644..100644
--- /dev/null
--- 2/src/elamengine.cpp
+++ b/elam/src/elamengine.cpp

diff --cc elam/src/elamexpression.cpp
index 0000000,494d279..494d279
mode 000000,100644..100644
--- /dev/null
--- 2/src/elamexpression.cpp
+++ b/elam/src/elamexpression.cpp

diff --cc elam/src/elamfloatengine.cpp
index 0000000,cca26a8..cca26a8
mode 000000,100644..100644
--- /dev/null
--- 2/src/elamfloatengine.cpp
+++ b/elam/src/elamfloatengine.cpp

diff --cc elam/src/elamintengine.cpp
index 0000000,b301066..b301066
mode 000000,100644..100644
--- /dev/null
--- 2/src/elamintengine.cpp
+++ b/elam/src/elamintengine.cpp

diff --cc elam/src/elamstringengine.cpp
index 0000000,559fb15..559fb15
mode 000000,100644..100644
--- /dev/null
--- 2/src/elamstringengine.cpp
+++ b/elam/src/elamstringengine.cpp

diff --cc elam/src/elamunary.cpp
index 0000000,f3b6e5d..f3b6e5d
mode 000000,100644..100644
--- /dev/null
--- 2/src/elamunary.cpp
+++ b/elam/src/elamunary.cpp

diff --cc elam/src/elamvalue.cpp
index 0000000,5f8febd..5f8febd
mode 000000,100644..100644
--- /dev/null
--- 2/src/elamvalue.cpp
+++ b/elam/src/elamvalue.cpp

diff --cc elam/tests/eval/eval.cpp
index 0000000,afdf8df..afdf8df
mode 000000,100644..100644
--- /dev/null
--- 2/tests/eval/eval.cpp
+++ b/elam/tests/eval/eval.cpp

diff --cc elam/tests/eval/eval.h
index 0000000,ef4409c..ef4409c
mode 000000,100644..100644
--- /dev/null
--- 2/tests/eval/eval.h
+++ b/elam/tests/eval/eval.h

diff --cc elam/tests/eval/eval.pro
index 0000000,1d1eb8f..1d1eb8f
mode 000000,100644..100644
--- /dev/null
--- 2/tests/eval/eval.pro
+++ b/elam/tests/eval/eval.pro

diff --cc elam/tests/parser/parser.cpp
index 0000000,449b31b..449b31b
mode 000000,100644..100644
--- /dev/null
--- 2/tests/parser/parser.cpp
+++ b/elam/tests/parser/parser.cpp

diff --cc elam/tests/parser/parser.h
index 0000000,215de9d..215de9d
mode 000000,100644..100644
--- /dev/null
--- 2/tests/parser/parser.h
+++ b/elam/tests/parser/parser.h

diff --cc elam/tests/parser/parser.pro
index 0000000,50a126c..50a126c
mode 000000,100644..100644
--- /dev/null
--- 2/tests/parser/parser.pro
+++ b/elam/tests/parser/parser.pro