Context Navigation

← Previous Change
Next Change →

Changeset 382 for cpp/frams

Timestamp:

05/22/15 04:15:14 (9 years ago)

Author:

Message:

Moving frams/virtfile to common/virtfile:

file references updated (includes, makefile)
common/virtfile can no longer use the Framsticks specific SString (using std::string instead)

Location:

cpp/frams

Files:

: 20 edited

Makefile-SDK-files (modified) (2 diffs)
_demos/f0_variants_test.cpp (modified) (1 diff)
_demos/full_props.cpp (modified) (1 diff)
_demos/geno_test.cpp (modified) (1 diff)
_demos/genomanipulation.cpp (modified) (1 diff)
_demos/geometry/geometrytestutils.cpp (modified) (1 diff)
_demos/loader_test.cpp (modified) (1 diff)
_demos/loader_test_param.cpp (modified) (1 diff)
_demos/multiline_f0_test.cpp (modified) (1 diff)
_demos/neuro_layout_test.cpp (modified) (1 diff)
_demos/neuro_test.cpp (modified) (1 diff)
_demos/shapeconvert.cpp (modified) (1 diff)
_demos/simil_test.cpp (modified) (1 diff)
loggers/loggertostdout.h (modified) (1 diff)
param/multiparamload.h (modified) (1 diff)
param/param.h (modified) (1 diff)
util/sstringutils.cpp (modified) (1 diff)
util/sstringutils.h (modified) (1 diff)
vm/framscript.l (modified) (2 diffs)
vm/framscript.y (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed

cpp/frams/Makefile-SDK-files

-                      r375
+                      r382
 # ALL_DIRS is later expanded by the shell, no spaces/newlines allowed, or it breaks
 ALL_DIRS={common,frams,frams/canvas,frams/config,frams/loggers,frams/genetics,frams/genetics/f0,frams/genetics/f1,frams/genetics/f2,frams/genetics/f3,frams/genetics/f4,frams/genetics/f5,frams/genetics/f6,frams/genetics/f7,frams/genetics/f8,frams/genetics/f9,frams/genetics/fF,frams/genetics/fT,frams/model,frams/neuro,frams/neuro/impl,frams/param,frams/test,frams/util,frams/vm/classes,frams/virtfile,frams/_demos,frams/model/geometry,frams/_demos/geometry,frams/model/similarity,frams/model/similarity/SVD}
+ALL_DIRS={common,frams,frams/canvas,frams/config,frams/loggers,frams/genetics,frams/genetics/f0,frams/genetics/f1,frams/genetics/f2,frams/genetics/f3,frams/genetics/f4,frams/genetics/f5,frams/genetics/f6,frams/genetics/f7,frams/genetics/f8,frams/genetics/f9,frams/genetics/fF,frams/genetics/fT,frams/model,frams/neuro,frams/neuro/impl,frams/param,frams/test,frams/util,frams/vm/classes,common/virtfile,frams/_demos,frams/model/geometry,frams/_demos/geometry,frams/model/similarity,frams/model/similarity/SVD}
 GENMANF4=frams/genetics/f4/oper_f4.o
 …
 #### sdk_tests
 GENOMANIPULATION_OBJS= frams/_demos/genomanipulation.o frams/loggers/loggertostdout.o frams/virtfile/virtfile.o  $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS)
+GENOMANIPULATION_OBJS= frams/_demos/genomanipulation.o frams/loggers/loggertostdout.o common/virtfile/virtfile.o  $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS)
 MULTILINE_F0_OBJS=frams/_demos/multiline_f0_test.o frams/virtfile/stringfile.o frams/virtfile/virtfile.o frams/loggers/loggertostdout.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS)
+MULTILINE_F0_OBJS=frams/_demos/multiline_f0_test.o common/virtfile/stringfile.o common/virtfile/virtfile.o frams/loggers/loggertostdout.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS)
 F0_VARIANTS_OBJS=frams/_demos/f0_variants_test.o frams/virtfile/stringfile.o frams/virtfile/virtfile.o frams/loggers/loggertostdout.o   $(SDK_OBJS) $(GENOCONV_SDK_OBJS)
+F0_VARIANTS_OBJS=frams/_demos/f0_variants_test.o common/virtfile/stringfile.o common/virtfile/virtfile.o frams/loggers/loggertostdout.o   $(SDK_OBJS) $(GENOCONV_SDK_OBJS)
 LOADER_TEST_OBJS=frams/_demos/genotypeloader.o frams/_demos/loader_test.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS)
+LOADER_TEST_OBJS=frams/_demos/genotypeloader.o frams/_demos/loader_test.o common/virtfile/virtfile.o frams/param/multiparamload.o common/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS)
 LOADER_TEST_PARAM_OBJS=frams/_demos/loader_test_param.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile.o frams/loggers/loggertostdout.o $(SDK_OBJS)
+LOADER_TEST_PARAM_OBJS=frams/_demos/loader_test_param.o common/virtfile/virtfile.o frams/param/multiparamload.o common/virtfile/stdiofile.o frams/loggers/loggertostdout.o $(SDK_OBJS)
 GENOCONV_TEST_OBJS= frams/_demos/genoconv_test.o frams/_demos/printconvmap.o frams/loggers/loggertostdout.o frams/virtfile/virtfile.o  $(SDK_OBJS) $(GENOCONV_SDK_OBJS)
+GENOCONV_TEST_OBJS= frams/_demos/genoconv_test.o frams/_demos/printconvmap.o frams/loggers/loggertostdout.o common/virtfile/virtfile.o  $(SDK_OBJS) $(GENOCONV_SDK_OBJS)
 GENO_TEST_OBJS= frams/_demos/geno_test.o frams/virtfile/virtfile.o frams/loggers/loggertostdout.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS)
+GENO_TEST_OBJS= frams/_demos/geno_test.o common/virtfile/virtfile.o frams/loggers/loggertostdout.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS)
 GENOOPER_TEST_OBJS=frams/_demos/genooper_test.o frams/virtfile/virtfile.o frams/loggers/loggertostdout.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS)
+GENOOPER_TEST_OBJS=frams/_demos/genooper_test.o common/virtfile/virtfile.o frams/loggers/loggertostdout.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS)
 GENOOPER_TEST_FTEST_OBJS=frams/_demos/genooper_test_fTest.o frams/virtfile/virtfile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS) $(GENMAN_FT)
+GENOOPER_TEST_FTEST_OBJS=frams/_demos/genooper_test_fTest.o common/virtfile/virtfile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS) $(GENMAN_FT)
 NEURO_TEST_OBJS= frams/_demos/neuro_test.o frams/loggers/loggertostdout.o frams/virtfile/virtfile.o \
+NEURO_TEST_OBJS= frams/_demos/neuro_test.o frams/loggers/loggertostdout.o common/virtfile/virtfile.o \
         frams/neuro/neuroimpl.o frams/neuro/neurofactory.o frams/neuro/impl/neuroimpl-simple.o frams/neuro/impl/neuroimpl-channels.o \
         frams/neuro/impl/neuroimpl-fuzzy.o frams/neuro/impl/neuroimpl-fuzzy-f0.o  $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS)
 FULL_PROPS_OBJS= frams/_demos/full_props.o frams/loggers/loggertostdout.o frams/virtfile/virtfile.o  frams/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS)
+FULL_PROPS_OBJS= frams/_demos/full_props.o frams/loggers/loggertostdout.o common/virtfile/virtfile.o  common/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS)
 SHAPECONVERT_OBJS= frams/_demos/shapeconvert.o frams/loggers/loggertostdout.o frams/virtfile/virtfile.o  frams/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS)
+SHAPECONVERT_OBJS= frams/_demos/shapeconvert.o frams/loggers/loggertostdout.o common/virtfile/virtfile.o  common/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS)
 SERIAL_TEST_OBJS= frams/_demos/serial_test.o frams/virtfile/virtfile.o  $(SDK_OBJS) $(GENOCONV_SDK_OBJS)
+SERIAL_TEST_OBJS= frams/_demos/serial_test.o common/virtfile/virtfile.o  $(SDK_OBJS) $(GENOCONV_SDK_OBJS)
 PART_SHAPES_OBJS= frams/_demos/part_shapes.o frams/virtfile/virtfile.o  $(SDK_OBJS) $(GENOCONV_SDK_OBJS)
+PART_SHAPES_OBJS= frams/_demos/part_shapes.o common/virtfile/virtfile.o  $(SDK_OBJS) $(GENOCONV_SDK_OBJS)
 NEURO_LAYOUT_TEST_OBJS= frams/_demos/neuro_layout_test.o frams/virtfile/virtfile.o frams/loggers/loggertostdout.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS) frams/canvas/nn_layout_model.o frams/canvas/nn_simple_layout.o frams/canvas/nn_smart_layout.o
+NEURO_LAYOUT_TEST_OBJS= frams/_demos/neuro_layout_test.o common/virtfile/virtfile.o frams/loggers/loggertostdout.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS) frams/canvas/nn_layout_model.o frams/canvas/nn_simple_layout.o frams/canvas/nn_smart_layout.o
 GEOMETRY_INFO_TEST_OBJS=frams/_demos/geometry/info_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GEOMETRY_OBJS)
+GEOMETRY_INFO_TEST_OBJS=frams/_demos/geometry/info_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o common/virtfile/virtfile.o frams/param/multiparamload.o common/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GEOMETRY_OBJS)
 GEOMETRY_SURFACE_TEST_OBJS=frams/_demos/geometry/surface_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GEOMETRY_OBJS)
+GEOMETRY_SURFACE_TEST_OBJS=frams/_demos/geometry/surface_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o common/virtfile/virtfile.o frams/param/multiparamload.o common/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GEOMETRY_OBJS)
 GEOMETRY_VOLUME_TEST_OBJS=frams/_demos/geometry/volume_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GEOMETRY_OBJS)
+GEOMETRY_VOLUME_TEST_OBJS=frams/_demos/geometry/volume_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o common/virtfile/virtfile.o frams/param/multiparamload.o common/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GEOMETRY_OBJS)
 GEOMETRY_APICES_TEST_OBJS=frams/_demos/geometry/apices_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GEOMETRY_OBJS)
+GEOMETRY_APICES_TEST_OBJS=frams/_demos/geometry/apices_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o common/virtfile/virtfile.o frams/param/multiparamload.o common/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GEOMETRY_OBJS)
 SIMIL_TEST_OBJS=frams/_demos/simil_test.o frams/model/similarity/SVD/lapack.o frams/model/similarity/SVD/matrix_tools.o frams/model/similarity/simil_match.o frams/model/similarity/simil_model.o  \
      frams/_demos/genotypeloader.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile.o frams/loggers/loggertostdout.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS)
+     frams/_demos/genotypeloader.o common/virtfile/virtfile.o frams/param/multiparamload.o common/virtfile/stdiofile.o frams/loggers/loggertostdout.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS)
 SIMIL_UNITTESTS_OBJS=frams/_demos/simil_unittests.o frams/model/similarity/simil_match.o

cpp/frams/_demos/f0_variants_test.cpp

r375	r382
6	6	#include <stdio.h>
7	7	#include <time.h>
8		#include <~~frams~~/virtfile/stdiofile.h>
	8	#include <common/virtfile/stdiofile.h>
9	9
10	10	#include <frams/genetics/defgenoconv.h>

cpp/frams/_demos/full_props.cpp

r375	r382
6	6	#include <stdio.h>
7	7	#include <time.h>
8		#include <~~frams~~/virtfile/stdiofile.h>
	8	#include <common/virtfile/stdiofile.h>
9	9
10	10	#include <frams/model/model.h>

cpp/frams/_demos/geno_test.cpp

r375	r382
3	3	// See LICENSE.txt for details.
4	4
5		#include <~~frams~~/virtfile/stdiofile.h>
	5	#include <common/virtfile/stdiofile.h>
6	6	#include <frams/util/sstringutils.h>
7	7	#include <frams/genetics/preconfigured.h>

cpp/frams/_demos/genomanipulation.cpp

r375	r382
6	6	#include <stdio.h>
7	7	#include <time.h>
8		#include <~~frams~~/virtfile/stdiofile.h>
	8	#include <common/virtfile/stdiofile.h>
9	9
10	10	#include <frams/model/model.h>

cpp/frams/_demos/geometry/geometrytestutils.cpp

r348	r382
6	6
7	7	#include "../genotypeloader.h"
8		#include <~~frams~~/virtfile/stdiofile.h>
	8	#include <common/virtfile/stdiofile.h>
9	9	#include <math.h>
10	10	#include <stdio.h>

cpp/frams/_demos/loader_test.cpp

r348	r382
4	4
5	5	#include "genotypeloader.h"
6		#include <~~frams~~/virtfile/stdiofile.h>
	6	#include <common/virtfile/stdiofile.h>
7	7
8	8	/**

cpp/frams/_demos/loader_test_param.cpp

r375	r382
4	4
5	5	#include <frams/param/multiparamload.h>
6		#include <~~frams~~/virtfile/stdiofile.h>
	6	#include <common/virtfile/stdiofile.h>
7	7	#include <frams/loggers/loggertostdout.h>
8	8

cpp/frams/_demos/multiline_f0_test.cpp

-                      r375
+                      r382
 #include <stdio.h>
 #include <time.h>
 #include <frams/virtfile/stdiofile.h>
+#include <common/virtfile/stdiofile.h>
 #include <frams/genetics/preconfigured.h>
 #include <frams/model/model.h>
 #include <frams/loggers/loggertostdout.h>
 #include <frams/virtfile/stringfile.h>
+#include <common/virtfile/stringfile.h>
 int main(int argc,char*argv[])

cpp/frams/_demos/neuro_layout_test.cpp

r375	r382
3	3	// See LICENSE.txt for details.
4	4
5		#include <~~frams~~/virtfile/stdiofile.h>
	5	#include <common/virtfile/stdiofile.h>
6	6	#include <frams/util/sstringutils.h>
7	7	#include <frams/genetics/preconfigured.h>

cpp/frams/_demos/neuro_test.cpp

r375	r382
4	4
5	5	#include <frams/genetics/geno.h>
6		#include <~~frams~~/virtfile/stdiofile.h>
	6	#include <common/virtfile/stdiofile.h>
7	7	#include <frams/util/sstringutils.h>
8	8	#include <frams/genetics/preconfigured.h>

cpp/frams/_demos/shapeconvert.cpp

r375	r382
6	6	#include <stdio.h>
7	7	#include <time.h>
8		#include <~~frams~~/virtfile/stdiofile.h>
	8	#include <common/virtfile/stdiofile.h>
9	9
10	10	#include <frams/model/model.h>

cpp/frams/_demos/simil_test.cpp

r375	r382
8	8	#include "frams/_demos/genotypeloader.h"
9	9	#include "frams/genetics/preconfigured.h"
10		#include "~~frams~~/virtfile/stdiofile.h"
	10	#include "common/virtfile/stdiofile.h"
11	11	#include "frams/model/similarity/simil_model.h"
12	12

cpp/frams/loggers/loggertostdout.h

r378	r382
7	7
8	8	#include "loggers.h"
9		#include <~~frams~~/virtfile/virtfile.h>
	9	#include <common/virtfile/virtfile.h>
10	10
11	11	class LoggerToStdout : public LoggerBase

cpp/frams/param/multiparamload.h

r333	r382
8	8	#include <stdio.h>
9	9	#include "param.h"
10		#include <~~frams~~/virtfile/virtfile.h>
	10	#include <common/virtfile/virtfile.h>
11	11	#include <frams/util/extvalue.h>
12	12

cpp/frams/param/param.h

r375	r382
11	11	#include <frams/util/list.h>
12	12	#include <frams/util/statrick.h>
13		#include <~~frams~~/virtfile/virtfile.h>
	13	#include <common/virtfile/virtfile.h>
14	14	#include <common/log.h>
15	15

cpp/frams/util/sstringutils.cpp

r375	r382
4	4
5	5	#include "sstringutils.h"
6		#include <~~frams~~/virtfile/virtfile.h>
	6	#include <common/virtfile/virtfile.h>
7	7	#include <common/log.h>
8	8	#include <common/nonstd.h>

cpp/frams/util/sstringutils.h

r286	r382
7	7
8	8	#include "sstring.h"
9		#include <~~frams~~/virtfile/virtfile.h>
	9	#include <common/virtfile/virtfile.h>
10	10
11	11	/// return: 1=ok 0=error

cpp/frams/vm/framscript.l

-                      r348
+                      r382
                     if (end)
+                       {
                        trctx.tmp+=SString(yytext,end-yytext);
                        framscriptlval.setString(quoteMultiline(trctx.tmp));
+                       trctx.tmp+=string(yytext,end-yytext);
+                       framscriptlval.setString(quoteMultiline(SString(trctx.tmp.c_str())));
                        yyless((end-yytext)+3);
                        BEGIN 0;
 …
+                       }
                     else
                        trctx.tmp+=SString(yytext,yyleng);
+                       trctx.tmp+=string(yytext,yyleng);
+                    }
 <multiline>\n       {trctx.line++; trctx.linechanged=true; trctx.tmp+="\n";}

cpp/frams/vm/framscript.y

-                      r375
+                      r382
                    trstack.adjust(+1);
+                   }
            trctx.tmp=0;
+           trctx.tmp="";
            trctx.divertOut();
            //trctx.out->printf("# expr#3\n");
 …
            if (!$7.constant) { trctx.out->printf("inc m0\n"); trstack.adjust(+1); }
            trctx.restoreOut();
            $$.setString(trctx.tmp);
+           $$.setString(trctx.tmp.c_str());
            //trctx.out->printf("# pseudoblok_statement pos=%d\n",trstack.currentPos());
+           }

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 382 for cpp/frams

Legend:

Download in other formats: