From 18e5490a1d36da346b079497bfb410edd6dd5ab8 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 20 Aug 2010 10:00:34 +0200 Subject: Test C++ type handling (anonymous types, aliasing) --- tracer/makefile | 3 +- tracer/types/driver.cxx | 35 +++++++++++++++++++++ tracer/types/makefile | 81 +++++++++++++++++++++++++++++++++++++++++++++++++ tracer/types/test.hxx | 34 +++++++++++++++++++++ tracer/types/test.std | 0 5 files changed, 152 insertions(+), 1 deletion(-) create mode 100644 tracer/types/driver.cxx create mode 100644 tracer/types/makefile create mode 100644 tracer/types/test.hxx create mode 100644 tracer/types/test.std diff --git a/tracer/makefile b/tracer/makefile index 41368ea..03b8747 100644 --- a/tracer/makefile +++ b/tracer/makefile @@ -7,7 +7,8 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../build/bootstrap.make tests := \ object \ -transaction +transaction \ +types default := $(out_base)/ test := $(out_base)/.test diff --git a/tracer/types/driver.cxx b/tracer/types/driver.cxx new file mode 100644 index 0000000..3b28480 --- /dev/null +++ b/tracer/types/driver.cxx @@ -0,0 +1,35 @@ +// file : tracer/types/driver.cxx +// author : Boris Kolpackov +// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +// Test C++ type handling (anonymous types, aliasing). +// + +#include +#include +#include + +#include "test.hxx" +#include "test-odb.hxx" + +using namespace std; +using namespace odb; + +template +struct same_p +{ + static const bool result = false; +}; + +template +struct same_p +{ + static const bool result = true; +}; + +int +main () +{ + assert ((same_p::id_type, int>::result)); +} diff --git a/tracer/types/makefile b/tracer/types/makefile new file mode 100644 index 0000000..382d1b5 --- /dev/null +++ b/tracer/types/makefile @@ -0,0 +1,81 @@ +# file : tracer/types/makefile +# author : Boris Kolpackov +# copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make + +cxx_tun := driver.cxx +odb_hdr := test.hxx +cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(odb_hdr:.hxx=-odb.o)) +cxx_od := $(cxx_obj:.o=.o.d) + +driver := $(out_base)/driver +test := $(out_base)/.test +clean := $(out_base)/.clean + +# Import. +# +$(call import,\ + $(scf_root)/import/odb/stub.make,\ + odb: odb,odb-rules: odb_rules) + +$(call import,\ + $(scf_root)/import/libodb/stub.make,\ + l: odb.l,cpp-options: odb.l.cpp-options) + +$(call import,\ + $(scf_root)/import/libodb-tracer/stub.make,\ + l: odb_tracer.l,cpp-options: odb_tracer.l.cpp-options) + +# Build. +# +$(driver): $(cxx_obj) $(odb_tracer.l) $(odb.l) +$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) +$(cxx_obj) $(cxx_od): $(odb_tracer.l.cpp-options) $(odb.l.cpp-options) + +genf := $(addprefix $(odb_hdr:.hxx=-odb),.hxx .ixx .cxx) +gen := $(addprefix $(out_base)/,$(genf)) + +$(gen): $(odb) +$(gen): odb := $(odb) +$(gen): odb_options += --database tracer +$(gen): cpp_options := -I$(out_base) +$(gen): $(odb_tracer.l.cpp-options) $(odb.l.cpp-options) + +$(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) + +# Alias for default target. +# +$(out_base)/: $(driver) + +# Test. +# +$(test): $(driver) $(src_base)/test.std + $(call message,test $<,$< | diff -u $(src_base)/test.std -) + +# Clean. +# +$(clean): \ + $(driver).o.clean \ + $(addsuffix .cxx.clean,$(cxx_obj)) \ + $(addsuffix .cxx.clean,$(cxx_od)) \ + $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean)) + +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif + +# How to. +# +$(call include,$(odb_rules)) +$(call include,$(bld_root)/cxx/cxx-d.make) +$(call include,$(bld_root)/cxx/cxx-o.make) +$(call include,$(bld_root)/cxx/o-e.make) diff --git a/tracer/types/test.hxx b/tracer/types/test.hxx new file mode 100644 index 0000000..965f133 --- /dev/null +++ b/tracer/types/test.hxx @@ -0,0 +1,34 @@ +// file : tracer/types/test.hxx +// author : Boris Kolpackov +// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#ifndef TEST_HXX +#define TEST_HXX + +#ifdef ODB_COMPILER +typedef int int_t; +typedef short num_t; +#else +typedef int num_t; +#endif + +typedef num_t num_type; + +#pragma odb object +struct object1 +{ + typedef int int_type; + + #pragma odb id + int_type id_; +}; + +#pragma odb object +struct object2 +{ + #pragma odb id + num_type num_; +}; + +#endif // TEST_HXX diff --git a/tracer/types/test.std b/tracer/types/test.std new file mode 100644 index 0000000..e69de29 -- cgit v1.1