reorganizing class hierarchy

git-svn-id: svn://ttmath.org/publicrep/morm/trunk@1075 e52654a7-88a9-db11-a3e9-0013d4bc506e

src/Makefile.dep

@@ -1,44 +1,98 @@
 # DO NOT DELETE
 
-baseescaper.o: baseescaper.h ../../pikotools/textstream/textstream.h
-baseescaper.o: ../../pikotools/space/space.h
-baseescaper.o: ../../pikotools/textstream/types.h ../../pikotools/date/date.h
-baseescaper.o: ../../pikotools/convert/convert.h
-baseescaper.o: ../../pikotools/convert/inttostr.h
-baseescaper.o: ../../pikotools/convert/strtoint.h
-baseescaper.o: ../../pikotools/convert/text.h ../../pikotools/convert/misc.h
-baseescaper.o: ../../pikotools/membuffer/membuffer.h
-baseescaper.o: ../../pikotools/textstream/types.h ../../pikotools/utf8/utf8.h
-expression.o: expression.h ../../pikotools/textstream/textstream.h
-expression.o: ../../pikotools/space/space.h
-expression.o: ../../pikotools/textstream/types.h ../../pikotools/date/date.h
-expression.o: ../../pikotools/convert/convert.h
-expression.o: ../../pikotools/convert/inttostr.h
-expression.o: ../../pikotools/convert/strtoint.h
-expression.o: ../../pikotools/convert/text.h ../../pikotools/convert/misc.h
-expression.o: ../../pikotools/membuffer/membuffer.h
-expression.o: ../../pikotools/textstream/types.h morm_types.h baseescaper.h
-expression.o: model.h modelconnector.h
+baseexpression.o: baseexpression.h ../../pikotools/textstream/textstream.h
+baseexpression.o: ../../pikotools/space/space.h
+baseexpression.o: ../../pikotools/textstream/types.h
+baseexpression.o: ../../pikotools/date/date.h
+baseexpression.o: ../../pikotools/convert/convert.h
+baseexpression.o: ../../pikotools/convert/inttostr.h
+baseexpression.o: ../../pikotools/convert/strtoint.h
+baseexpression.o: ../../pikotools/convert/text.h
+baseexpression.o: ../../pikotools/convert/misc.h
+baseexpression.o: ../../pikotools/membuffer/membuffer.h
+baseexpression.o: ../../pikotools/textstream/types.h morm_types.h model.h
+baseexpression.o: modelconnector.h ../../pikotools/utf8/utf8.h
+dbconnector.o: dbconnector.h dbexpression.h baseexpression.h
+dbconnector.o: ../../pikotools/textstream/textstream.h
+dbconnector.o: ../../pikotools/space/space.h
+dbconnector.o: ../../pikotools/textstream/types.h ../../pikotools/date/date.h
+dbconnector.o: ../../pikotools/convert/convert.h
+dbconnector.o: ../../pikotools/convert/inttostr.h
+dbconnector.o: ../../pikotools/convert/strtoint.h
+dbconnector.o: ../../pikotools/convert/text.h ../../pikotools/convert/misc.h
+dbconnector.o: ../../pikotools/membuffer/membuffer.h
+dbconnector.o: ../../pikotools/textstream/types.h morm_types.h model.h
+dbconnector.o: modelconnector.h
+dbexpression.o: dbexpression.h baseexpression.h
+dbexpression.o: ../../pikotools/textstream/textstream.h
+dbexpression.o: ../../pikotools/space/space.h
+dbexpression.o: ../../pikotools/textstream/types.h
+dbexpression.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h
+dbexpression.o: ../../pikotools/convert/inttostr.h
+dbexpression.o: ../../pikotools/convert/strtoint.h
+dbexpression.o: ../../pikotools/convert/text.h ../../pikotools/convert/misc.h
+dbexpression.o: ../../pikotools/membuffer/membuffer.h
+dbexpression.o: ../../pikotools/textstream/types.h morm_types.h
 finder.o: finder.h
-jsonescaper.o: jsonescaper.h baseescaper.h
-jsonescaper.o: ../../pikotools/textstream/textstream.h
-jsonescaper.o: ../../pikotools/space/space.h
-jsonescaper.o: ../../pikotools/textstream/types.h ../../pikotools/date/date.h
-jsonescaper.o: ../../pikotools/convert/convert.h
-jsonescaper.o: ../../pikotools/convert/inttostr.h
-jsonescaper.o: ../../pikotools/convert/strtoint.h
-jsonescaper.o: ../../pikotools/convert/text.h ../../pikotools/convert/misc.h
-jsonescaper.o: ../../pikotools/membuffer/membuffer.h
-jsonescaper.o: ../../pikotools/textstream/types.h
+flatconnector.o: flatconnector.h flatexpression.h baseexpression.h
+flatconnector.o: ../../pikotools/textstream/textstream.h
+flatconnector.o: ../../pikotools/space/space.h
+flatconnector.o: ../../pikotools/textstream/types.h
+flatconnector.o: ../../pikotools/date/date.h
+flatconnector.o: ../../pikotools/convert/convert.h
+flatconnector.o: ../../pikotools/convert/inttostr.h
+flatconnector.o: ../../pikotools/convert/strtoint.h
+flatconnector.o: ../../pikotools/convert/text.h
+flatconnector.o: ../../pikotools/convert/misc.h
+flatconnector.o: ../../pikotools/membuffer/membuffer.h
+flatconnector.o: ../../pikotools/textstream/types.h morm_types.h model.h
+flatconnector.o: modelconnector.h
+flatexpression.o: flatexpression.h baseexpression.h
+flatexpression.o: ../../pikotools/textstream/textstream.h
+flatexpression.o: ../../pikotools/space/space.h
+flatexpression.o: ../../pikotools/textstream/types.h
+flatexpression.o: ../../pikotools/date/date.h
+flatexpression.o: ../../pikotools/convert/convert.h
+flatexpression.o: ../../pikotools/convert/inttostr.h
+flatexpression.o: ../../pikotools/convert/strtoint.h
+flatexpression.o: ../../pikotools/convert/text.h
+flatexpression.o: ../../pikotools/convert/misc.h
+flatexpression.o: ../../pikotools/membuffer/membuffer.h
+flatexpression.o: ../../pikotools/textstream/types.h morm_types.h
+jsonconnector.o: jsonconnector.h flatconnector.h flatexpression.h
+jsonconnector.o: baseexpression.h ../../pikotools/textstream/textstream.h
+jsonconnector.o: ../../pikotools/space/space.h
+jsonconnector.o: ../../pikotools/textstream/types.h
+jsonconnector.o: ../../pikotools/date/date.h
+jsonconnector.o: ../../pikotools/convert/convert.h
+jsonconnector.o: ../../pikotools/convert/inttostr.h
+jsonconnector.o: ../../pikotools/convert/strtoint.h
+jsonconnector.o: ../../pikotools/convert/text.h
+jsonconnector.o: ../../pikotools/convert/misc.h
+jsonconnector.o: ../../pikotools/membuffer/membuffer.h
+jsonconnector.o: ../../pikotools/textstream/types.h morm_types.h
+jsonconnector.o: jsonexpression.h
+jsonexpression.o: jsonexpression.h flatexpression.h baseexpression.h
+jsonexpression.o: ../../pikotools/textstream/textstream.h
+jsonexpression.o: ../../pikotools/space/space.h
+jsonexpression.o: ../../pikotools/textstream/types.h
+jsonexpression.o: ../../pikotools/date/date.h
+jsonexpression.o: ../../pikotools/convert/convert.h
+jsonexpression.o: ../../pikotools/convert/inttostr.h
+jsonexpression.o: ../../pikotools/convert/strtoint.h
+jsonexpression.o: ../../pikotools/convert/text.h
+jsonexpression.o: ../../pikotools/convert/misc.h
+jsonexpression.o: ../../pikotools/membuffer/membuffer.h
+jsonexpression.o: ../../pikotools/textstream/types.h morm_types.h
 model.o: model.h ../../pikotools/textstream/textstream.h
 model.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
 model.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h
 model.o: ../../pikotools/convert/inttostr.h
 model.o: ../../pikotools/convert/strtoint.h ../../pikotools/convert/text.h
 model.o: ../../pikotools/convert/misc.h ../../pikotools/membuffer/membuffer.h
-model.o: ../../pikotools/textstream/types.h modelconnector.h expression.h
-model.o: morm_types.h baseescaper.h
-modelconnector.o: modelconnector.h expression.h
+model.o: ../../pikotools/textstream/types.h modelconnector.h baseexpression.h
+model.o: morm_types.h
+modelconnector.o: modelconnector.h baseexpression.h
 modelconnector.o: ../../pikotools/textstream/textstream.h
 modelconnector.o: ../../pikotools/space/space.h
 modelconnector.o: ../../pikotools/textstream/types.h
@@ -49,17 +103,33 @@ modelconnector.o: ../../pikotools/convert/strtoint.h
 modelconnector.o: ../../pikotools/convert/text.h
 modelconnector.o: ../../pikotools/convert/misc.h
 modelconnector.o: ../../pikotools/membuffer/membuffer.h
-modelconnector.o: ../../pikotools/textstream/types.h morm_types.h
-modelconnector.o: baseescaper.h model.h jsonescaper.h postgresqlescaper.h
-postgresqlescaper.o: postgresqlescaper.h baseescaper.h
-postgresqlescaper.o: ../../pikotools/textstream/textstream.h
-postgresqlescaper.o: ../../pikotools/space/space.h
-postgresqlescaper.o: ../../pikotools/textstream/types.h
-postgresqlescaper.o: ../../pikotools/date/date.h
-postgresqlescaper.o: ../../pikotools/convert/convert.h
-postgresqlescaper.o: ../../pikotools/convert/inttostr.h
-postgresqlescaper.o: ../../pikotools/convert/strtoint.h
-postgresqlescaper.o: ../../pikotools/convert/text.h
-postgresqlescaper.o: ../../pikotools/convert/misc.h
-postgresqlescaper.o: ../../pikotools/membuffer/membuffer.h
-postgresqlescaper.o: ../../pikotools/textstream/types.h
+modelconnector.o: ../../pikotools/textstream/types.h morm_types.h model.h
+modelconnector.o: flatconnector.h flatexpression.h dbconnector.h
+modelconnector.o: dbexpression.h
+postgresqlconnector.o: postgresqlconnector.h dbconnector.h dbexpression.h
+postgresqlconnector.o: baseexpression.h
+postgresqlconnector.o: ../../pikotools/textstream/textstream.h
+postgresqlconnector.o: ../../pikotools/space/space.h
+postgresqlconnector.o: ../../pikotools/textstream/types.h
+postgresqlconnector.o: ../../pikotools/date/date.h
+postgresqlconnector.o: ../../pikotools/convert/convert.h
+postgresqlconnector.o: ../../pikotools/convert/inttostr.h
+postgresqlconnector.o: ../../pikotools/convert/strtoint.h
+postgresqlconnector.o: ../../pikotools/convert/text.h
+postgresqlconnector.o: ../../pikotools/convert/misc.h
+postgresqlconnector.o: ../../pikotools/membuffer/membuffer.h
+postgresqlconnector.o: ../../pikotools/textstream/types.h morm_types.h
+postgresqlconnector.o: ../../pikotools/utf8/utf8.h postgresqlexpression.h
+postgresqlexpression.o: postgresqlexpression.h dbexpression.h
+postgresqlexpression.o: baseexpression.h
+postgresqlexpression.o: ../../pikotools/textstream/textstream.h
+postgresqlexpression.o: ../../pikotools/space/space.h
+postgresqlexpression.o: ../../pikotools/textstream/types.h
+postgresqlexpression.o: ../../pikotools/date/date.h
+postgresqlexpression.o: ../../pikotools/convert/convert.h
+postgresqlexpression.o: ../../pikotools/convert/inttostr.h
+postgresqlexpression.o: ../../pikotools/convert/strtoint.h
+postgresqlexpression.o: ../../pikotools/convert/text.h
+postgresqlexpression.o: ../../pikotools/convert/misc.h
+postgresqlexpression.o: ../../pikotools/membuffer/membuffer.h
+postgresqlexpression.o: ../../pikotools/textstream/types.h morm_types.h