add QT Creator files to .gitignore

src/Makefile uses now 'find' for looking for *.cpp files
and we don't need Makefile.o.dep anymore

.gitignore

@@ -3,3 +3,12 @@
 .settings/
 *.o
 *.a
+.clangd
+.qtc_clangd/
+ezc.cflags
+ezc.config
+ezc.creator
+ezc.creator.user
+ezc.cxxflags
+ezc.files
+ezc.includes

LICENSE

@@ -1,28 +1,24 @@
-Copyright (c) 2007-2016, Tomasz Sowa
+Copyright (c) 2007-2022, Tomasz Sowa
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
- * Redistributions of source code must retain the above copyright notice,
+1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
+this list of conditions and the following disclaimer.
-   
+
- * Redistributions in binary form must reproduce the above copyright
+2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
+notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
+documentation and/or other materials provided with the distribution.
-   
- * Neither the name Tomasz Sowa nor the names of contributors to this
-   project may be used to endorse or promote products derived
-   from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-THE POSSIBILITY OF SUCH DAMAGE.
+POSSIBILITY OF SUCH DAMAGE.

Makefile

@@ -0,0 +1,25 @@
+
+
+export CXX
+export CXXFLAGS
+export AR
+
+
+all: src
+
+
+src: FORCE
+	$(MAKE) -C src
+
+
+clean: FORCE
+	$(MAKE) -C src clean
+
+
+depend: FORCE
+	$(MAKE) -C src depend
+
+
+
+FORCE:
+

src/Makefile

@@ -1,39 +1,45 @@
-include Makefile.o.dep
+sourcefiles:=$(shell find . -name "*.cpp")
+objfiles:=$(patsubst %.cpp,%.o,$(sourcefiles))
 
-libname=ezc.a
 
-ifndef GLOBAL_WORKING_DIR
+
-GLOBAL_WORKING_DIR := $(shell pwd)/../..
+ifndef CXX
+CXX = g++
 endif
 
-current_path := $(shell pwd)
+ifndef CXXFLAGS
-global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
+CXXFLAGS = -Wall -pedantic -O2 -std=c++20 -I../../pikotools/src -I/usr/local/include
+endif
 
+ifndef AR
+AR = ar
+endif
+
+
+
+
+libname = ezc.a
 
 
 all: $(libname)
 
-$(libname): $(o)
-	ar rcs $(libname) $(o)
-
 
+$(libname): $(objfiles)
+	$(AR) rcs $(libname) $(objfiles)
 
 
 %.o: %.cpp
-	$(CXX) -c $(CXXFLAGS) -I$(GLOBAL_WORKING_DIR)/pikotools/src $<
+	$(CXX) -c $(CXXFLAGS) -o $@ $<
-
-
-depend:
-	# !! IMPROVE ME
-	# as Ezc is a different project we rather shoudn't use '-I$(global_relative_working_dir)/pikotools' here?
-	makedepend -Y. -I$(global_relative_working_dir)/pikotools/src -f- *.cpp > Makefile.dep
-	echo -n "o = " > Makefile.o.dep
-	ls -1 *.cpp | xargs -I foo echo -n foo " " | sed -E "s/([^\.]*)\.cpp[ ]/\1\.o/g" >> Makefile.o.dep
 
 
 clean:
-	rm -f *.o
+	rm -f $(objfiles)
 	rm -f $(libname)
 
 
-include Makefile.dep
+depend:
+	makedepend -Y. -I../../pikotools/src -f- $(sourcefiles) > Makefile.dep
+
+
+-include Makefile.dep
+

src/Makefile.dep

@@ -1,40 +1,42 @@
 # DO NOT DELETE
 
-blocks.o: blocks.h item.h cache.h functions.h ../../pikotools/src/utf8/utf8.h
+./blocks.o: blocks.h item.h cache.h functions.h
-blocks.o: ../../pikotools/src/textstream/stream.h
+./blocks.o: ../../pikotools/src/utf8/utf8.h
-blocks.o: ../../pikotools/src/utf8/utf8_templates.h
+./blocks.o: ../../pikotools/src/textstream/stream.h
-blocks.o: ../../pikotools/src/utf8/utf8_private.h funinfo.h objects.h
+./blocks.o: ../../pikotools/src/utf8/utf8_templates.h
-cache.o: cache.h item.h functions.h ../../pikotools/src/utf8/utf8.h
+./blocks.o: ../../pikotools/src/utf8/utf8_private.h funinfo.h objects.h
-cache.o: ../../pikotools/src/textstream/stream.h
+./cache.o: cache.h item.h functions.h ../../pikotools/src/utf8/utf8.h
-cache.o: ../../pikotools/src/utf8/utf8_templates.h
+./cache.o: ../../pikotools/src/textstream/stream.h
-cache.o: ../../pikotools/src/utf8/utf8_private.h funinfo.h objects.h blocks.h
+./cache.o: ../../pikotools/src/utf8/utf8_templates.h
-item.o: item.h
+./cache.o: ../../pikotools/src/utf8/utf8_private.h funinfo.h objects.h
-models.o: models.h
+./cache.o: blocks.h
-pattern.o: pattern.h item.h cache.h functions.h
+./item.o: item.h
-pattern.o: ../../pikotools/src/utf8/utf8.h
+./pattern.o: pattern.h item.h cache.h functions.h
-pattern.o: ../../pikotools/src/textstream/stream.h
+./pattern.o: ../../pikotools/src/utf8/utf8.h
-pattern.o: ../../pikotools/src/utf8/utf8_templates.h
+./pattern.o: ../../pikotools/src/textstream/stream.h
-pattern.o: ../../pikotools/src/utf8/utf8_private.h funinfo.h objects.h
+./pattern.o: ../../pikotools/src/utf8/utf8_templates.h
-pattern.o: blocks.h
+./pattern.o: ../../pikotools/src/utf8/utf8_private.h funinfo.h objects.h
-patternparser.o: patternparser.h blocks.h item.h cache.h functions.h
+./pattern.o: blocks.h
-patternparser.o: ../../pikotools/src/utf8/utf8.h
+./patternparser.o: patternparser.h blocks.h item.h cache.h functions.h
-patternparser.o: ../../pikotools/src/textstream/stream.h
+./patternparser.o: ../../pikotools/src/utf8/utf8.h
-patternparser.o: ../../pikotools/src/utf8/utf8_templates.h
+./patternparser.o: ../../pikotools/src/textstream/stream.h
-patternparser.o: ../../pikotools/src/utf8/utf8_private.h funinfo.h objects.h
+./patternparser.o: ../../pikotools/src/utf8/utf8_templates.h
-patternparser.o: pattern.h ../../pikotools/src/log/log.h
+./patternparser.o: ../../pikotools/src/utf8/utf8_private.h funinfo.h
-patternparser.o: ../../pikotools/src/textstream/textstream.h
+./patternparser.o: objects.h pattern.h ../../pikotools/src/log/log.h
-patternparser.o: ../../pikotools/src/textstream/stream.h
+./patternparser.o: ../../pikotools/src/textstream/textstream.h
-patternparser.o: ../../pikotools/src/space/space.h
+./patternparser.o: ../../pikotools/src/textstream/stream.h
-patternparser.o: ../../pikotools/src/textstream/types.h
+./patternparser.o: ../../pikotools/src/space/space.h
-patternparser.o: ../../pikotools/src/convert/inttostr.h
+./patternparser.o: ../../pikotools/src/textstream/types.h
-patternparser.o: ../../pikotools/src/date/date.h
+./patternparser.o: ../../pikotools/src/convert/inttostr.h
-patternparser.o: ../../pikotools/src/membuffer/membuffer.h
+./patternparser.o: ../../pikotools/src/date/date.h
-patternparser.o: ../../pikotools/src/textstream/types.h
+./patternparser.o: ../../pikotools/src/membuffer/membuffer.h
-patternparser.o: ../../pikotools/src/log/filelog.h
+./patternparser.o: ../../pikotools/src/textstream/types.h
-patternparser.o: ../../pikotools/src/convert/convert.h
+./patternparser.o: ../../pikotools/src/log/filelog.h
-patternparser.o: ../../pikotools/src/convert/inttostr.h
+./patternparser.o: ../../pikotools/src/convert/convert.h
-patternparser.o: ../../pikotools/src/convert/patternreplacer.h
+./patternparser.o: ../../pikotools/src/convert/inttostr.h
-patternparser.o: ../../pikotools/src/convert/strtoint.h
+./patternparser.o: ../../pikotools/src/convert/patternreplacer.h
-patternparser.o: ../../pikotools/src/convert/text.h
+./patternparser.o: ../../pikotools/src/convert/strtoint.h
-patternparser.o: ../../pikotools/src/convert/misc.h
+./patternparser.o: ../../pikotools/src/convert/text.h
-patternparser.o: ../../pikotools/src/convert/double.h
+./patternparser.o: ../../pikotools/src/convert/misc.h
+./patternparser.o: ../../pikotools/src/convert/double.h
+./models.o: models.h

src/Makefile.o.dep

@@ -1 +0,0 @@
-o = blocks.o cache.o item.o models.o pattern.o patternparser.o 

src/blocks.cpp

@@ -1,6 +1,6 @@
 /*
  * This file is a part of EZC -- Easy templating in C++ library
- * and is distributed under the BSD 3-Clause licence.
+ * and is distributed under the 2-Clause BSD licence.
  * Author: Tomasz Sowa <t.sowa@ttmath.org>
  */
 
@@ -11,28 +11,25 @@
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
- *  * Redistributions of source code must retain the above copyright notice,
+ * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
+ * this list of conditions and the following disclaimer.
  *
- *  * Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
+ * notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
+ * documentation and/or other materials provided with the distribution.
- *
- *  * Neither the name Tomasz Sowa nor the names of contributors to this
- *    project may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 
 #include "blocks.h"

src/blocks.h

@@ -1,6 +1,6 @@
 /*
  * This file is a part of EZC -- Easy templating in C++ library
- * and is distributed under the BSD 3-Clause licence.
+ * and is distributed under the 2-Clause BSD licence.
  * Author: Tomasz Sowa <t.sowa@ttmath.org>
  */
 
@@ -11,28 +11,25 @@
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
- *  * Redistributions of source code must retain the above copyright notice,
+ * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
+ * this list of conditions and the following disclaimer.
  *
- *  * Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
+ * notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
+ * documentation and/or other materials provided with the distribution.
- *
- *  * Neither the name Tomasz Sowa nor the names of contributors to this
- *    project may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 
 #ifndef headerfile_ezc_blocks

src/cache.cpp

@@ -1,6 +1,6 @@
 /*
  * This file is a part of EZC -- Easy templating in C++ library
- * and is distributed under the BSD 3-Clause licence.
+ * and is distributed under the 2-Clause BSD licence.
  * Author: Tomasz Sowa <t.sowa@ttmath.org>
  */
 
@@ -10,29 +10,26 @@
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
- *  * Redistributions of source code must retain the above copyright notice,
+ * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
+ * this list of conditions and the following disclaimer.
- *    
+ *
- *  * Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
+ * notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
+ * documentation and/or other materials provided with the distribution.
- *    
- *  * Neither the name Tomasz Sowa nor the names of contributors to this
- *    project may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 
 #include "cache.h"

src/cache.h

@@ -1,6 +1,6 @@
 /*
  * This file is a part of EZC -- Easy templating in C++ library
- * and is distributed under the BSD 3-Clause licence.
+ * and is distributed under the 2-Clause BSD licence.
  * Author: Tomasz Sowa <t.sowa@ttmath.org>
  */
 
@@ -10,29 +10,26 @@
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
- *  * Redistributions of source code must retain the above copyright notice,
+ * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
+ * this list of conditions and the following disclaimer.
- *    
+ *
- *  * Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
+ * notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
+ * documentation and/or other materials provided with the distribution.
- *    
- *  * Neither the name Tomasz Sowa nor the names of contributors to this
- *    project may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 
 

src/expressionparser.h

@@ -1,6 +1,6 @@
 /*
  * This file is a part of EZC -- Easy templating in C++ library
- * and is distributed under the BSD 3-Clause licence.
+ * and is distributed under the 2-Clause BSD licence.
  * Author: Tomasz Sowa <t.sowa@ttmath.org>
  */
 
@@ -11,28 +11,25 @@
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
- *  * Redistributions of source code must retain the above copyright notice,
+ * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
+ * this list of conditions and the following disclaimer.
  *
- *  * Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
+ * notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
+ * documentation and/or other materials provided with the distribution.
- *
- *  * Neither the name Tomasz Sowa nor the names of contributors to this
- *    project may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 
 

src/ezc.h

@@ -1,44 +1,42 @@
 /*
  * This file is a part of EZC -- Easy templating in C++ library
- * and is distributed under the BSD 3-Clause licence.
+ * and is distributed under the 2-Clause BSD licence.
  * Author: Tomasz Sowa <t.sowa@ttmath.org>
  */
 
 /* 
- * Copyright (c) 2007-2014, Tomasz Sowa
+ * Copyright (c) 2007-2022, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
- *  * Redistributions of source code must retain the above copyright notice,
+ * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
+ * this list of conditions and the following disclaimer.
- *    
+ *
- *  * Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
+ * notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
+ * documentation and/or other materials provided with the distribution.
- *    
- *  * Neither the name Tomasz Sowa nor the names of contributors to this
- *    project may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 
 
 #ifndef headerfile_ezc_ezc
 #define headerfile_ezc_ezc
 
+#include "version.h"
 #include "generator.h"
 #include "patternparser.h"
 

src/functions.h

@@ -1,6 +1,6 @@
 /*
  * This file is a part of EZC -- Easy templating in C++ library
- * and is distributed under the BSD 3-Clause licence.
+ * and is distributed under the 2-Clause BSD licence.
  * Author: Tomasz Sowa <t.sowa@ttmath.org>
  */
 
@@ -10,29 +10,26 @@
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
- *  * Redistributions of source code must retain the above copyright notice,
+ * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
+ * this list of conditions and the following disclaimer.
- *    
+ *
- *  * Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
+ * notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
+ * documentation and/or other materials provided with the distribution.
- *    
- *  * Neither the name Tomasz Sowa nor the names of contributors to this
- *    project may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 
 #ifndef headerfile_ezc_functions

src/funinfo.h

@@ -1,38 +1,35 @@
 /*
  * This file is a part of EZC -- Easy templating in C++ library
- * and is distributed under the BSD 3-Clause licence.
+ * and is distributed under the 2-Clause BSD licence.
  * Author: Tomasz Sowa <t.sowa@ttmath.org>
  */
 
 /* 
- * Copyright (c) 2007-2016, Tomasz Sowa
+ * Copyright (c) 2007-2023, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
- *  * Redistributions of source code must retain the above copyright notice,
+ * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
+ * this list of conditions and the following disclaimer.
- *    
+ *
- *  * Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
+ * notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
+ * documentation and/or other materials provided with the distribution.
- *    
- *  * Neither the name Tomasz Sowa nor the names of contributors to this
- *    project may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 
 
@@ -204,7 +201,7 @@ struct FunInfo
 	// for other statements than [for] this is always zero
 	size_t iter;
 
-	//
+	// an item from the tree
 	const Item & item;
 
 

src/generator.h

@@ -1,38 +1,35 @@
 /*
  * This file is a part of EZC -- Easy templating in C++ library
- * and is distributed under the BSD 3-Clause licence.
+ * and is distributed under the 2-Clause BSD licence.
  * Author: Tomasz Sowa <t.sowa@ttmath.org>
  */
 
 /* 
- * Copyright (c) 2007-2021, Tomasz Sowa
+ * Copyright (c) 2007-2023, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
- *  * Redistributions of source code must retain the above copyright notice,
+ * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
+ * this list of conditions and the following disclaimer.
- *    
+ *
- *  * Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
+ * notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
+ * documentation and/or other materials provided with the distribution.
- *    
- *  * Neither the name Tomasz Sowa nor the names of contributors to this
- *    project may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 
 
@@ -1422,10 +1419,14 @@ bool Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::CallDate(
 template<class StreamType, bool is_pikotools_stream, bool is_autoescape_stream>
 void Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::CallSpaceObjectForLastField(std::vector<Var> & parameters, StreamType & out_stream, pt::Space * space)
 {
-	if( !IsTestingFunctionExistence() )
+	if( IsTestingFunctionExistence() )
+	{
+		last_res = true;
+	}
+	else
 	{
-		// CHECKME should we convert the last value to last_res?
 		DumpSpaceIfNeeded(parameters, out_stream, space);
+		last_res = space->object_size() > 0;
 	}
 }
 
@@ -1463,8 +1464,14 @@ void Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::CallSpace
 	else
 	{
 		// we are not in [for..], it can be for example [if...], return true if the table is not empty
-		// if we are in [if-def...] - then last_res is set later in MakeTextIfDef(Item & item) when Call() method returns
+		if( IsTestingFunctionExistence() )
-		last_res = !table->empty();
+		{
+			last_res = true;
+		}
+		else
+		{
+			last_res = !table->empty();
+		}
 	}
 
 	if( !IsTestingFunctionExistence() )
@@ -1596,9 +1603,14 @@ bool Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::CallSpace
 		{
 			if( is_last_field )
 			{
-				if( !IsTestingFunctionExistence() )
+				if( IsTestingFunctionExistence() )
+				{
+					last_res = true;
+				}
+				else
 				{
 					PrintLastSpaceField(space, parameters, out_stream);
+					last_res = space->to_bool();
 				}
 
 				field_index += 1;
@@ -1640,12 +1652,14 @@ bool Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::CallModel
 	if( parameters.empty() )
 	{
 		FunInfo<StreamType> info(out_stream, parameters, empty, in_stream, stack_tab[stack_index-1], *stack_tab[stack_index-1].item);
+		PrepareEnvStruct(info);
 		found = model.get_raw_value(nullptr, field.c_str(), nullptr, info, str, false);
 		last_res = info.res;
 	}
 	else
 	{
 		FunInfo<StreamType> info(out_stream, parameters, parameters[0].str, in_stream, stack_tab[stack_index-1], *stack_tab[stack_index-1].item);
+		PrepareEnvStruct(info);
 		found = model.get_raw_value(nullptr, field.c_str(), nullptr, info, str, false);
 		last_res = info.res;
 	}
@@ -1669,6 +1683,8 @@ bool Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::CallModel
 	if( find_helper.field_index == fields.size() )
 	{
 		// all fields items are models or models containers
+		// at the moment we do not set last_res
+		// we don't know whether the last object has properties (fields) or not
 		if( !IsTestingFunctionExistence() )
 		{
 			DumpModelIfNeeded(model, parameters, out_stream);
@@ -2471,7 +2487,8 @@ void Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::MakeTextF
 		}
 		else
 		{
-			Call(item.function, nullptr, stream_temp1, true, empty_stream);
+			if( !Call(item.function, nullptr, stream_temp1, true, empty_stream) )
+				return;
 		}
 
 		if( !last_res )

src/item.cpp

@@ -1,6 +1,6 @@
 /*
  * This file is a part of EZC -- Easy templating in C++ library
- * and is distributed under the BSD 3-Clause licence.
+ * and is distributed under the 2-Clause BSD licence.
  * Author: Tomasz Sowa <t.sowa@ttmath.org>
  */
 
@@ -10,29 +10,26 @@
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
- *  * Redistributions of source code must retain the above copyright notice,
+ * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
+ * this list of conditions and the following disclaimer.
- *    
+ *
- *  * Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
+ * notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
+ * documentation and/or other materials provided with the distribution.
- *    
- *  * Neither the name Tomasz Sowa nor the names of contributors to this
- *    project may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 
 

src/item.h

@@ -1,6 +1,6 @@
 /*
  * This file is a part of EZC -- Easy templating in C++ library
- * and is distributed under the BSD 3-Clause licence.
+ * and is distributed under the 2-Clause BSD licence.
  * Author: Tomasz Sowa <t.sowa@ttmath.org>
  */
 
@@ -10,29 +10,26 @@
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
- *  * Redistributions of source code must retain the above copyright notice,
+ * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
+ * this list of conditions and the following disclaimer.
- *    
+ *
- *  * Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
+ * notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
+ * documentation and/or other materials provided with the distribution.
- *    
- *  * Neither the name Tomasz Sowa nor the names of contributors to this
- *    project may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 
 

src/models.cpp

@@ -1,6 +1,6 @@
 /*
  * This file is a part of EZC -- Easy templating in C++ library
- * and is distributed under the BSD 3-Clause licence.
+ * and is distributed under the 2-Clause BSD licence.
  * Author: Tomasz Sowa <t.sowa@ttmath.org>
  */
 
@@ -11,28 +11,25 @@
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
- *  * Redistributions of source code must retain the above copyright notice,
+ * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
+ * this list of conditions and the following disclaimer.
  *
- *  * Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
+ * notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
+ * documentation and/or other materials provided with the distribution.
- *
- *  * Neither the name Tomasz Sowa nor the names of contributors to this
- *    project may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 
 #include "models.h"
@@ -125,6 +122,12 @@ morm::Wrapper * Models::Find(const std::wstring & name)
 }
 
 
+Models::ModelsMap & Models::GetMap()
+{
+	return models_map;
+}
+
+
 
 }
 

src/models.h

@@ -1,6 +1,6 @@
 /*
  * This file is a part of EZC -- Easy templating in C++ library
- * and is distributed under the BSD 3-Clause licence.
+ * and is distributed under the 2-Clause BSD licence.
  * Author: Tomasz Sowa <t.sowa@ttmath.org>
  */
 
@@ -11,28 +11,25 @@
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
- *  * Redistributions of source code must retain the above copyright notice,
+ * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
+ * this list of conditions and the following disclaimer.
  *
- *  * Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
+ * notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
+ * documentation and/or other materials provided with the distribution.
- *
- *  * Neither the name Tomasz Sowa nor the names of contributors to this
- *    project may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 
 #ifndef headerfile_ezc_models
@@ -53,6 +50,8 @@ class Models
 {
 public:
 
+	typedef std::map<std::wstring, morm::Wrapper> ModelsMap;
+
 	Models();
 	~Models();
 
@@ -130,12 +129,13 @@ public:
 	}
 
 	morm::Wrapper * Find(const std::wstring & name);
+	ModelsMap & GetMap();
 	void Clear();
 
 
 protected:
 
-	std::map<std::wstring, morm::Wrapper> models_map;
+	ModelsMap models_map;
 
 
 };

src/objects.h

@@ -1,6 +1,6 @@
 /*
  * This file is a part of EZC -- Easy templating in C++ library
- * and is distributed under the BSD 3-Clause licence.
+ * and is distributed under the 2-Clause BSD licence.
  * Author: Tomasz Sowa <t.sowa@ttmath.org>
  */
 
@@ -11,28 +11,25 @@
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
- *  * Redistributions of source code must retain the above copyright notice,
+ * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
+ * this list of conditions and the following disclaimer.
  *
- *  * Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
+ * notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
+ * documentation and/or other materials provided with the distribution.
- *
- *  * Neither the name Tomasz Sowa nor the names of contributors to this
- *    project may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 
 #ifndef headerfile_ezc_objects

src/outstreams.h

@@ -1,6 +1,6 @@
 /*
  * This file is a part of EZC -- Easy templating in C++ library
- * and is distributed under the BSD 3-Clause licence.
+ * and is distributed under the 2-Clause BSD licence.
  * Author: Tomasz Sowa <t.sowa@ttmath.org>
  */
 
@@ -11,28 +11,25 @@
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
- *  * Redistributions of source code must retain the above copyright notice,
+ * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
+ * this list of conditions and the following disclaimer.
  *
- *  * Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
+ * notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
+ * documentation and/or other materials provided with the distribution.
- *
- *  * Neither the name Tomasz Sowa nor the names of contributors to this
- *    project may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 
 #ifndef headerfile_ezc_outstreams

src/pattern.cpp

@@ -1,38 +1,35 @@
 /*
  * This file is a part of EZC -- Easy templating in C++ library
- * and is distributed under the BSD 3-Clause licence.
+ * and is distributed under the 2-Clause BSD licence.
  * Author: Tomasz Sowa <t.sowa@ttmath.org>
  */
 
 /* 
- * Copyright (c) 2007-2014, Tomasz Sowa
+ * Copyright (c) 2007-2012, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
- *  * Redistributions of source code must retain the above copyright notice,
+ * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
+ * this list of conditions and the following disclaimer.
- *    
+ *
- *  * Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
+ * notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
+ * documentation and/or other materials provided with the distribution.
- *    
- *  * Neither the name Tomasz Sowa nor the names of contributors to this
- *    project may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 
 #include "pattern.h"

src/pattern.h

@@ -1,6 +1,6 @@
 /*
  * This file is a part of EZC -- Easy templating in C++ library
- * and is distributed under the BSD 3-Clause licence.
+ * and is distributed under the 2-Clause BSD licence.
  * Author: Tomasz Sowa <t.sowa@ttmath.org>
  */
 
@@ -10,29 +10,26 @@
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
- *  * Redistributions of source code must retain the above copyright notice,
+ * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
+ * this list of conditions and the following disclaimer.
- *    
+ *
- *  * Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
+ * notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
+ * documentation and/or other materials provided with the distribution.
- *    
- *  * Neither the name Tomasz Sowa nor the names of contributors to this
- *    project may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 
 

src/patternparser.cpp

@@ -1,6 +1,6 @@
 /*
  * This file is a part of EZC -- Easy templating in C++ library
- * and is distributed under the BSD 3-Clause licence.
+ * and is distributed under the 2-Clause BSD licence.
  * Author: Tomasz Sowa <t.sowa@ttmath.org>
  */
 
@@ -10,29 +10,26 @@
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
- *  * Redistributions of source code must retain the above copyright notice,
+ * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
+ * this list of conditions and the following disclaimer.
- *    
+ *
- *  * Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
+ * notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
+ * documentation and/or other materials provided with the distribution.
- *    
- *  * Neither the name Tomasz Sowa nor the names of contributors to this
- *    project may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 
 

src/patternparser.h

@@ -1,6 +1,6 @@
 /*
  * This file is a part of EZC -- Easy templating in C++ library
- * and is distributed under the BSD 3-Clause licence.
+ * and is distributed under the 2-Clause BSD licence.
  * Author: Tomasz Sowa <t.sowa@ttmath.org>
  */
 
@@ -10,29 +10,26 @@
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
- *  * Redistributions of source code must retain the above copyright notice,
+ * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
+ * this list of conditions and the following disclaimer.
- *    
+ *
- *  * Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
+ * notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
+ * documentation and/or other materials provided with the distribution.
- *    
- *  * Neither the name Tomasz Sowa nor the names of contributors to this
- *    project may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 
 

src/version.h

@@ -0,0 +1,44 @@
+/*
+ * This file is a part of EZC -- Easy templating in C++ library
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2022, Tomasz Sowa
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef headerfile_ezc_version
+#define headerfile_ezc_version
+
+
+#define EZC_VERSION_MAJOR 0
+#define EZC_VERSION_MINOR 9
+#define EZC_VERSION_PATCH 5
+
+
+#endif