From e48e4f8fe494d61ffc05c26984fa286af2e71b89 Mon Sep 17 00:00:00 2001 From: Joe George Date: Wed, 3 May 2017 16:42:02 -0400 Subject: [PATCH] Fix tabs and spaces --- LICENSE | 24 ++--- Makefile | 4 +- config/Make.rules | 96 +++++++++---------- cpp/Makefile | 4 +- cpp/config/Make.rules | 50 +++++----- cpp/demo/Freeze/backup/Makefile.mk | 4 +- cpp/demo/Freeze/bench/Makefile.mk | 20 ++-- cpp/demo/Freeze/casino/Makefile.mk | 8 +- cpp/demo/Freeze/customEvictor/Makefile.mk | 14 +-- cpp/demo/Freeze/library/Makefile.mk | 42 ++++---- cpp/demo/Freeze/phonebook/Makefile.mk | 36 +++---- cpp/demo/Freeze/transform/Makefile.mk | 30 +++--- cpp/demo/Manual/evictorFilesystem/Makefile.mk | 10 +- cpp/demo/Manual/mapFilesystem/Makefile.mk | 16 ++-- cpp/src/Freeze/Makefile.mk | 14 +-- cpp/src/Freeze/MapDb.cpp | 12 +-- cpp/src/FreezeScript/Makefile.mk | 66 ++++++------- cpp/test/Freeze/complex/Makefile.mk | 14 +-- cpp/test/Freeze/dbmap/Makefile.mk | 14 +-- cpp/test/Freeze/fileLock/Makefile.mk | 2 +- cpp/test/FreezeScript/dbmap/check.xml | 2 +- cpp/test/FreezeScript/dbmap/init.xml | 2 +- cpp/test/FreezeScript/evictor/check.xml | 4 +- cpp/test/FreezeScript/evictor/transform.xml | 4 +- ice | 2 +- .../main/java/Freeze/FileLockException.java | 20 ++-- 26 files changed, 257 insertions(+), 257 deletions(-) diff --git a/LICENSE b/LICENSE index 6df097de..147e2c93 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA @@ -7,7 +7,7 @@ Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -56,8 +56,8 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE + + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -111,7 +111,7 @@ above, provided that you also meet all of these conditions: License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -169,7 +169,7 @@ access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -226,7 +226,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -256,7 +256,7 @@ make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -278,9 +278,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it diff --git a/Makefile b/Makefile index 9fec2ee6..504bbbeb 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ $(eval $(call make-global-rule,install,$(languages))) install:: install-doc install-slice $(eval $(call install-data-files,$(wildcard $(slicedir)/*/*.ice),$(slicedir),$(install_slicedir),\ - install-slice,"Installing slice files")) + install-slice,"Installing slice files")) $(eval $(call install-data-files,$(wildcard $(top_srcdir)/*LICENSE),$(top_srcdir),$(install_docdir),\ - install-doc,"Installing documentation files")) + install-doc,"Installing documentation files")) diff --git a/config/Make.rules b/config/Make.rules index 3a21f519..13496628 100644 --- a/config/Make.rules +++ b/config/Make.rules @@ -8,7 +8,7 @@ # Select an installation base directory. The directory will be created # if it does not exist. # -prefix ?= /opt/Ice-$(version) +prefix ?= /opt/Ice-$(version) # # The "root directory" for runpath embedded in executables. Can be set @@ -23,13 +23,13 @@ prefix ?= /opt/Ice-$(version) # Define embedded_runpath as no if you don't want any runpath added to # the executables. If not set, defaults to to "yes" # -embedded_runpath ?= yes +embedded_runpath ?= yes # # Define OPTIMIZE as yes if you want to build with optimization. # Otherwise Ice is build with debug information. # -#OPTIMIZE = yes +#OPTIMIZE = yes # # Define PLATFORMS to the list of platforms to build. This defaults @@ -38,7 +38,7 @@ embedded_runpath ?= yes # Run `make print V=supported-platforms' to see the list of supported # platforms on this system. # -PLATFORMS ?= $(firstword $(supported-platforms)) +PLATFORMS ?= $(firstword $(supported-platforms)) # # Configurations to build. This defaults to the first supported @@ -47,7 +47,7 @@ PLATFORMS ?= $(firstword $(supported-platforms)) # Run `make print V=supported-configs` to see the list of supported # configurations. # -CONFIGS ?= $(firstword $(supported-configs)) +CONFIGS ?= $(firstword $(supported-configs)) # # Third-party libraries @@ -56,43 +56,43 @@ CONFIGS ?= $(firstword $(supported-configs)) # where the compiler can find it, set the corresponding variable # below to the installation directory of the library. # -#DB_HOME ?= /opt/db -#EXPAT_HOME ?= /opt/expat -#BZ2_HOME ?= /opt/bz2 -#MCPP_HOME ?= /opt/mcpp +#DB_HOME ?= /opt/db +#EXPAT_HOME ?= /opt/expat +#BZ2_HOME ?= /opt/bz2 +#MCPP_HOME ?= /opt/mcpp # ---------------------------------------------------------------------- # Don't change anything below this line! # ---------------------------------------------------------------------- -os ?= $(shell uname) +os ?= $(shell uname) -include $(top_srcdir)/ice/config/Make.rules.$(os) -include $(top_srcdir)/ice/config/Make.project.rules -include $(top_srcdir)/ice/config/Make.tests.rules +include $(top_srcdir)/ice/config/Make.rules.$(os) +include $(top_srcdir)/ice/config/Make.project.rules +include $(top_srcdir)/ice/config/Make.tests.rules -include $(top_srcdir)/config/Make.rules.$(os) ifeq ($(USE_BIN_DIST),yes) -prefix := $(or $(ICE_HOME),$(if $(filter Darwin,$(os)),/usr/local,/usr)) -bindir ?= $(install_bindir) -libdir ?= $(install_libdir) -slicedir ?= $(install_slicedir) -includedir ?= $(install_includedir) +prefix := $(or $(ICE_HOME),$(if $(filter Darwin,$(os)),/usr/local,/usr)) +bindir ?= $(install_bindir) +libdir ?= $(install_libdir) +slicedir ?= $(install_slicedir) +includedir ?= $(install_includedir) else -bindir ?= $(call mappingdir,$(or $1,$(currentdir)),bin) -libdir ?= $(call mappingdir,$(or $1,$(currentdir)),lib) -slicedir ?= $(top_srcdir)/slice -includedir ?= $(call mappingdir,$(or $1,$(currentdir)),include) - -ice_bindir ?= $(top_srcdir)/ice/cpp/bin -ice_libdir ?= $(top_srcdir)/ice/cpp/lib -ice_slicedir ?= $(top_srcdir)/ice/slice -ice_includedir ?= $(top_srcdir)/ice/cpp/include +bindir ?= $(call mappingdir,$(or $1,$(currentdir)),bin) +libdir ?= $(call mappingdir,$(or $1,$(currentdir)),lib) +slicedir ?= $(top_srcdir)/slice +includedir ?= $(call mappingdir,$(or $1,$(currentdir)),include) + +ice_bindir ?= $(top_srcdir)/ice/cpp/bin +ice_libdir ?= $(top_srcdir)/ice/cpp/lib +ice_slicedir ?= $(top_srcdir)/ice/slice +ice_includedir ?= $(top_srcdir)/ice/cpp/include endif -version = 3.7.0 -soversion = 37 +version = 3.7.0 +soversion = 37 # # The compatversion is the lowest patch release with the same API. @@ -102,31 +102,31 @@ soversion = 37 # compatversion = $(version) -ice_src_dist := $(wildcard $(ice_home)/config/Make.rules) +ice_src_dist := $(wildcard $(ice_home)/config/Make.rules) -usr_dir_install := $(filter /usr%,$(prefix)) -install_bindir ?= $(prefix)/bin -install_libdir ?= $(prefix)/lib -install_slicedir ?= $(prefix)$(if $(usr_dir_install),/share/Ice-$(version))/slice -install_includedir ?= $(prefix)/include -install_docdir ?= $(prefix)$(if $(usr_dir_install),/share/Ice-$(version)) -install_mandir ?= $(prefix)$(if $(usr_dir_install),/share)/man +usr_dir_install := $(filter /usr%,$(prefix)) +install_bindir ?= $(prefix)/bin +install_libdir ?= $(prefix)/lib +install_slicedir ?= $(prefix)$(if $(usr_dir_install),/share/Ice-$(version))/slice +install_includedir ?= $(prefix)/include +install_docdir ?= $(prefix)$(if $(usr_dir_install),/share/Ice-$(version)) +install_mandir ?= $(prefix)$(if $(usr_dir_install),/share)/man # # Languages, platforms and configurations to build # -supported-languages = cpp java -supported-configs = shared +supported-languages = cpp java +supported-configs = shared # # Support for 3rd party libraries # -thirdparties := bz2 db expat mcpp -bz2_home := $(BZ2_HOME) -db_home := $(or $(DB_HOME),$(if $(filter Darwin,$(os)),/usr/local/opt/berkeley-db53,)) -db_ldflags := -ldb_cxx -expat_home := $(EXPAT_HOME) -mcpp_home := $(MCPP_HOME) +thirdparties := bz2 db expat mcpp +bz2_home := $(BZ2_HOME) +db_home := $(or $(DB_HOME),$(if $(filter Darwin,$(os)),/usr/local/opt/berkeley-db53,)) +db_ldflags := -ldb_cxx +expat_home := $(EXPAT_HOME) +mcpp_home := $(MCPP_HOME) $(foreach l,$(thirdparties),$(eval $(call make-lib,$l))) @@ -136,12 +136,12 @@ db_libdir ?= $(wildcard /usr/lib64/db53) # # Support for Ice libraries # -static_projects = % -shared_excludes = IceUtil Slice +static_projects = % +shared_excludes = IceUtil Slice $(eval $(call load-dependencies,$(addprefix $(top_srcdir)/ice/cpp/src/,IceUtil Slice Ice IceXML))) # Create component dependency variables -ice_targetdir := $(top_srcdir)/ice/cpp/lib +ice_targetdir := $(top_srcdir)/ice/cpp/lib $(foreach d,$(dependencies),$(eval $(call create-component-targets,ice,$d,library))) diff --git a/cpp/Makefile b/cpp/Makefile index 9bd2382d..b28557e6 100644 --- a/cpp/Makefile +++ b/cpp/Makefile @@ -4,8 +4,8 @@ # # ********************************************************************** -top_srcdir := .. -lang_srcdir := $(top_srcdir)/cpp +top_srcdir := .. +lang_srcdir := $(top_srcdir)/cpp include $(top_srcdir)/config/Make.rules include $(lang_srcdir)/config/Make.rules diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index 8ac64b9f..38519d72 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -8,12 +8,12 @@ # Don't change anything below this line! # ---------------------------------------------------------------------- --include $(lang_srcdir)/config/Make.rules.$(os) +-include $(lang_srcdir)/config/Make.rules.$(os) # # Supported configurations # -supported-configs = shared static +supported-configs = shared static slice2cpp_targetext = cpp slice2cpp_path = $(ice_bindir)/slice2cpp @@ -38,7 +38,7 @@ $2_sources += $$(addprefix $$($1_generated_srcdir)/,$$(addsuffix .cpp,$$($2_slic $2_generated_includedir := $$(or $$($2_generated_includedir),$$($1_generated_includedir)) $$(foreach d,$$($2_slice2freeze),$$(if $$($2_$$d),$$(eval $$(call make-slice2freeze,$$d,$$($2_$$d),\ - $$($2_$$d_slice),$$($2_generated_includedir),$$($1_generated_srcdir),$$($2_$$d_flags) $$($2_sliceflags))))) + $$($2_$$d_slice),$$($2_generated_includedir),$$($1_generated_srcdir),$$($2_$$d_flags) $$($2_sliceflags))))) $2_generated_headers += $$(foreach d,$$($2_slice2freeze),$$(if $$($2_$$d),$$($2_generated_includedir)/$$d.h)) $1_generated += $$(foreach d,$$($2_slice2freeze),$$(if $$($2_$$d),$$($2_generated_includedir)/$$d.h)) @@ -56,7 +56,7 @@ define make-freeze-project ifneq ($$($1_slice2freeze),) $$(foreach d,$$($1_slice2freeze),$$(eval $$(call make-slice2freeze,$$d,$$($1_$$d),\ - $$($1_$$d_slice),$$($1_generated_includedir),$$($1_generated_srcdir),$$($1_$$d_flags) $$($1_sliceflags)))) + $$($1_$$d_slice),$$($1_generated_includedir),$$($1_generated_srcdir),$$($1_$$d_flags) $$($1_sliceflags)))) $1_generated += $$(foreach d,$$($1_slice2freeze),$$($1_generated_includedir)/$$d.h) @@ -77,15 +77,15 @@ ifeq ($(USE_BIN_DIST),yes) else ifneq ($(filter ../ice/%,$1),) # Building ice submodule project -$1_cppflags += -I../ice/cpp/include -I../ice/cpp/include/generated -I../ice/cpp/src +$1_cppflags += -I../ice/cpp/include -I../ice/cpp/include/generated -I../ice/cpp/src else # Building freeze project -$1_slicecompiler := slice2cpp -$1_sliceflags += -I$(ice_slicedir) -I$(slicedir) -$1_cppflags += -I$(ice_includedir) -I$(includedir) -I$1/generated -I../ice/cpp/src -Isrc -$1_cppflags += -I$(ice_includedir)/generated -I$(includedir)/generated -$1_extensions := make-freeze-project -$1_component_extensions := make-freeze-components +$1_slicecompiler := slice2cpp +$1_sliceflags += -I$(ice_slicedir) -I$(slicedir) +$1_cppflags += -I$(ice_includedir) -I$(includedir) -I$1/generated -I../ice/cpp/src -Isrc +$1_cppflags += -I$(ice_includedir)/generated -I$(includedir)/generated +$1_extensions := make-freeze-project +$1_component_extensions := make-freeze-components endif $(make-project) srcs:: $1 @@ -96,14 +96,14 @@ endef # $(call make-cpp-test-project,$1=project) # define make-cpp-test-project -$1_slicecompiler := slice2cpp -$1_sliceflags += -I$(ice_slicedir) -I$(slicedir) -I$1 -$1_cppflags += -I$(ice_includedir) -I$(includedir) -I$1/generated -Itest/include -I$1 +$1_slicecompiler := slice2cpp +$1_sliceflags += -I$(ice_slicedir) -I$(slicedir) -I$1 +$1_cppflags += -I$(ice_includedir) -I$(includedir) -I$1/generated -Itest/include -I$1 ifneq ($(USE_BIN_DIST),yes) $1_cppflags += -I$(ice_includedir)/generated -I$(includedir)/generated endif -$1_extensions := make-freeze-project -$1_component_extensions := make-freeze-components +$1_extensions := make-freeze-project +$1_component_extensions := make-freeze-components $(make-project) tests:: $1 endef @@ -112,8 +112,8 @@ endef # $(create-cpp-test-project $1=test) # define create-cpp-test-project -$1_srcext := cpp -$1_dependencies := $$(or $$($1_dependencies),Freeze Ice) +$1_srcext := cpp +$1_dependencies := $$(or $$($1_dependencies),Freeze Ice) $(create-test-project) endef @@ -121,14 +121,14 @@ endef # $(call make-cpp-demo-project,$1=project) # define make-cpp-demo-project -$1_slicecompiler := slice2cpp -$1_sliceflags += -I$(ice_slicedir) -I$(slicedir) -I$1 -$1_cppflags += -I$(ice_includedir) -I$(includedir) -I$1/generated -I$1 +$1_slicecompiler := slice2cpp +$1_sliceflags += -I$(ice_slicedir) -I$(slicedir) -I$1 +$1_cppflags += -I$(ice_includedir) -I$(includedir) -I$1/generated -I$1 ifneq ($(USE_BIN_DIST),yes) $1_cppflags += -I$(ice_includedir)/generated -I$(includedir)/generated endif -$1_extensions := make-freeze-project -$1_component_extensions := make-freeze-components +$1_extensions := make-freeze-project +$1_component_extensions := make-freeze-components $(make-project) demos:: $1 endef @@ -137,8 +137,8 @@ endef # $(create-cpp-demo-project $1=demo) # define create-cpp-demo-project -$1_srcext := cpp -$1_dependencies := $$(or $$($1_dependencies),Freeze Ice) +$1_srcext := cpp +$1_dependencies := $$(or $$($1_dependencies),Freeze Ice) $(create-test-project) endef diff --git a/cpp/demo/Freeze/backup/Makefile.mk b/cpp/demo/Freeze/backup/Makefile.mk index 7b37f0b4..3dbdc8fd 100644 --- a/cpp/demo/Freeze/backup/Makefile.mk +++ b/cpp/demo/Freeze/backup/Makefile.mk @@ -4,9 +4,9 @@ # # ********************************************************************** -$(test)_client_sources := Client.cpp +$(test)_client_sources := Client.cpp $(test)_client_slice2freeze := IntLongMap -$(test)_client_IntLongMap := --dict IntLongMap,int,long +$(test)_client_IntLongMap := --dict IntLongMap,int,long demos += $(test) diff --git a/cpp/demo/Freeze/bench/Makefile.mk b/cpp/demo/Freeze/bench/Makefile.mk index 57c3cdea..83386507 100644 --- a/cpp/demo/Freeze/bench/Makefile.mk +++ b/cpp/demo/Freeze/bench/Makefile.mk @@ -8,16 +8,16 @@ $(test)_client_sources := Test.ice Client.cpp $(test)_client_slice2freeze := BenchTypes $(test)_client_BenchTypes := --dict "Demo::IntIntMap,int,int" \ - --dict "Demo::Struct1Struct2Map,Demo::Struct1,Demo::Struct2" \ - --dict "Demo::Struct1Class1Map,Demo::Struct1,Demo::Class1" \ - --dict "Demo::Struct1ObjectMap,Demo::Struct1,Object" \ - --dict "Demo::IndexedIntIntMap,int,int" \ - --dict-index "Demo::IndexedIntIntMap" \ - --dict "Demo::IndexedStruct1Struct2Map,Demo::Struct1,Demo::Struct2" \ - --dict-index "Demo::IndexedStruct1Struct2Map,s,case-insensitive" \ - --dict-index "Demo::IndexedStruct1Struct2Map,s1" \ - --dict "Demo::IndexedStruct1Class1Map,Demo::Struct1,Demo::Class1" \ - --dict-index "Demo::IndexedStruct1Class1Map,s,case-sensitive" + --dict "Demo::Struct1Struct2Map,Demo::Struct1,Demo::Struct2" \ + --dict "Demo::Struct1Class1Map,Demo::Struct1,Demo::Class1" \ + --dict "Demo::Struct1ObjectMap,Demo::Struct1,Object" \ + --dict "Demo::IndexedIntIntMap,int,int" \ + --dict-index "Demo::IndexedIntIntMap" \ + --dict "Demo::IndexedStruct1Struct2Map,Demo::Struct1,Demo::Struct2" \ + --dict-index "Demo::IndexedStruct1Struct2Map,s,case-insensitive" \ + --dict-index "Demo::IndexedStruct1Struct2Map,s1" \ + --dict "Demo::IndexedStruct1Class1Map,Demo::Struct1,Demo::Class1" \ + --dict-index "Demo::IndexedStruct1Class1Map,s,case-sensitive" $(test)_client_BenchTypes_slice := $(test)/Test.ice diff --git a/cpp/demo/Freeze/casino/Makefile.mk b/cpp/demo/Freeze/casino/Makefile.mk index 576b1d28..52da2b10 100644 --- a/cpp/demo/Freeze/casino/Makefile.mk +++ b/cpp/demo/Freeze/casino/Makefile.mk @@ -4,13 +4,13 @@ # # ********************************************************************** -$(test)_client_sources = Casino.ice Client.cpp +$(test)_client_sources = Casino.ice Client.cpp $(test)_server_sources = Casino.ice CasinoStore.ice \ BankI.cpp \ BetI.cpp \ - BetResolver.cpp \ - PlayerI.cpp \ - Server.cpp + BetResolver.cpp \ + PlayerI.cpp \ + Server.cpp demos += $(test) diff --git a/cpp/demo/Freeze/customEvictor/Makefile.mk b/cpp/demo/Freeze/customEvictor/Makefile.mk index ee8396e1..0d611ad8 100644 --- a/cpp/demo/Freeze/customEvictor/Makefile.mk +++ b/cpp/demo/Freeze/customEvictor/Makefile.mk @@ -4,19 +4,19 @@ # # ********************************************************************** -$(test)_client_sources = Item.ice Client.cpp +$(test)_client_sources = Item.ice Client.cpp $(test)_server_sources = Item.ice \ ItemInfo.ice \ ItemI.cpp \ - CurrentDatabase.cpp \ - Evictor.cpp \ - EvictorBase.cpp \ - Server.cpp \ - SimpleEvictor.cpp + CurrentDatabase.cpp \ + Evictor.cpp \ + EvictorBase.cpp \ + Server.cpp \ + SimpleEvictor.cpp $(test)_server_slice2freeze := Database -$(test)_server_Database := --dict Database,string,Warehouse::ItemInfo +$(test)_server_Database := --dict Database,string,Warehouse::ItemInfo $(test)_server_Database_slice := $(test)/ItemInfo.ice diff --git a/cpp/demo/Freeze/library/Makefile.mk b/cpp/demo/Freeze/library/Makefile.mk index 1c88bf6b..0f6026f9 100644 --- a/cpp/demo/Freeze/library/Makefile.mk +++ b/cpp/demo/Freeze/library/Makefile.mk @@ -4,33 +4,33 @@ # # ********************************************************************** -$(test)_client_sources := Library.ice \ - Client.cpp \ - Grammar.y \ - Parser.cpp \ - RunParser.cpp \ - Scanner.l +$(test)_client_sources := Library.ice \ + Client.cpp \ + Grammar.y \ + Parser.cpp \ + RunParser.cpp \ + Scanner.l $(test)_server_sources := Library.ice \ - BookFactory.cpp \ - LibraryI.cpp \ - Server.cpp + BookFactory.cpp \ + LibraryI.cpp \ + Server.cpp -$(test)_server_slice2freeze := LibraryTypes +$(test)_server_slice2freeze := LibraryTypes $(test)_collocated_sources := Library.ice \ - Collocated.cpp \ - Grammar.y \ - Parser.cpp \ - RunParser.cpp \ - Scanner.l \ - BookFactory.cpp \ - LibraryI.cpp + Collocated.cpp \ + Grammar.y \ + Parser.cpp \ + RunParser.cpp \ + Scanner.l \ + BookFactory.cpp \ + LibraryI.cpp -$(test)_collocated_slice2freeze := LibraryTypes +$(test)_collocated_slice2freeze := LibraryTypes -$(test)_slice2freeze := LibraryTypes -$(test)_LibraryTypes := --dict StringIsbnSeqDict,string,Ice::StringSeq -$(test)_LibraryTypes_slice := $(ice_slicedir)/Ice/BuiltinSequences.ice $(test)/Library.ice +$(test)_slice2freeze := LibraryTypes +$(test)_LibraryTypes := --dict StringIsbnSeqDict,string,Ice::StringSeq +$(test)_LibraryTypes_slice := $(ice_slicedir)/Ice/BuiltinSequences.ice $(test)/Library.ice demos += $(test) diff --git a/cpp/demo/Freeze/phonebook/Makefile.mk b/cpp/demo/Freeze/phonebook/Makefile.mk index 559e4787..ce64cdbd 100644 --- a/cpp/demo/Freeze/phonebook/Makefile.mk +++ b/cpp/demo/Freeze/phonebook/Makefile.mk @@ -4,33 +4,33 @@ # # ********************************************************************** -$(test)_client_sources := PhoneBook.ice \ +$(test)_client_sources := PhoneBook.ice \ Client.cpp \ - Grammar.y \ - Parser.cpp \ - RunParser.cpp \ - Scanner.l + Grammar.y \ + Parser.cpp \ + RunParser.cpp \ + Scanner.l $(test)_server_sources := PhoneBook.ice \ ContactFactory.cpp \ - PhoneBookI.cpp \ - Server.cpp + PhoneBookI.cpp \ + Server.cpp $(test)_server_slice2freeze := NameIndex -$(test)_collocated_sources := PhoneBook.ice \ +$(test)_collocated_sources := PhoneBook.ice \ ContactFactory.cpp \ - PhoneBookI.cpp \ - Collocated.cpp \ - Grammar.y \ - Parser.cpp \ - RunParser.cpp \ - Scanner.l + PhoneBookI.cpp \ + Collocated.cpp \ + Grammar.y \ + Parser.cpp \ + RunParser.cpp \ + Scanner.l -$(test)_collocated_slice2freeze := NameIndex +$(test)_collocated_slice2freeze := NameIndex -$(test)_slice2freeze := NameIndex -$(test)_NameIndex := --index NameIndex,Demo::Contact,name,case-insensitive -$(test)_NameIndex_slice := $(test)/PhoneBook.ice +$(test)_slice2freeze := NameIndex +$(test)_NameIndex := --index NameIndex,Demo::Contact,name,case-insensitive +$(test)_NameIndex_slice := $(test)/PhoneBook.ice demos += $(test) diff --git a/cpp/demo/Freeze/transform/Makefile.mk b/cpp/demo/Freeze/transform/Makefile.mk index b8895038..c7c38d65 100644 --- a/cpp/demo/Freeze/transform/Makefile.mk +++ b/cpp/demo/Freeze/transform/Makefile.mk @@ -6,27 +6,27 @@ $(test)_programs := create read recreate readnew -$(test)_create_sources := ContactData.ice create.cpp -$(test)_create_slice2freeze := Contacts +$(test)_create_sources := ContactData.ice create.cpp +$(test)_create_slice2freeze := Contacts -$(test)_read_sources := ContactData.ice read.cpp -$(test)_read_slice2freeze := Contacts +$(test)_read_sources := ContactData.ice read.cpp +$(test)_read_slice2freeze := Contacts -$(test)_recreate_sources := NewContactData.ice recreate.cpp -$(test)_recreate_slice2freeze := NewContacts +$(test)_recreate_sources := NewContactData.ice recreate.cpp +$(test)_recreate_slice2freeze := NewContacts -$(test)_readnew_sources := NewContactData.ice readnew.cpp -$(test)_readnew_slice2freeze := NewContacts +$(test)_readnew_sources := NewContactData.ice readnew.cpp +$(test)_readnew_slice2freeze := NewContacts -$(test)_slice2freeze := Contacts NewContacts +$(test)_slice2freeze := Contacts NewContacts -$(test)_Contacts := --dict "Demo::Contacts,string,Demo::ContactData,sort" \ - --dict-index "Demo::Contacts,phoneNumber,sort" -$(test)_Contacts_slice := $(test)/ContactData.ice +$(test)_Contacts := --dict "Demo::Contacts,string,Demo::ContactData,sort" \ + --dict-index "Demo::Contacts,phoneNumber,sort" +$(test)_Contacts_slice := $(test)/ContactData.ice -$(test)_NewContacts := --dict "Demo::NewContacts,string,Demo::ContactData,sort" \ - --dict-index "Demo::NewContacts,phoneNumber,sort" -$(test)_NewContacts_slice := $(test)/NewContactData.ice +$(test)_NewContacts := --dict "Demo::NewContacts,string,Demo::ContactData,sort" \ + --dict-index "Demo::NewContacts,phoneNumber,sort" +$(test)_NewContacts_slice := $(test)/NewContactData.ice demos += $(test) diff --git a/cpp/demo/Manual/evictorFilesystem/Makefile.mk b/cpp/demo/Manual/evictorFilesystem/Makefile.mk index 6e803f5b..25f80631 100644 --- a/cpp/demo/Manual/evictorFilesystem/Makefile.mk +++ b/cpp/demo/Manual/evictorFilesystem/Makefile.mk @@ -4,15 +4,15 @@ # # ********************************************************************** -$(test)_client_sources = Filesystem.ice \ +$(test)_client_sources = Filesystem.ice \ Client.cpp \ - Grammar.y \ - Parser.cpp \ - Scanner.l + Grammar.y \ + Parser.cpp \ + Scanner.l $(test)_server_sources = Filesystem.ice \ PersistentFilesystem.ice \ PersistentFilesystemI.cpp \ - Server.cpp + Server.cpp demos += $(test) diff --git a/cpp/demo/Manual/mapFilesystem/Makefile.mk b/cpp/demo/Manual/mapFilesystem/Makefile.mk index 0b01eeba..9f6d6ee1 100644 --- a/cpp/demo/Manual/mapFilesystem/Makefile.mk +++ b/cpp/demo/Manual/mapFilesystem/Makefile.mk @@ -4,20 +4,20 @@ # # ********************************************************************** -$(test)_client_sources = Filesystem.ice \ - Client.cpp \ - Grammar.y \ - Parser.cpp \ - Scanner.l +$(test)_client_sources = Filesystem.ice \ + Client.cpp \ + Grammar.y \ + Parser.cpp \ + Scanner.l $(test)_server_sources = Filesystem.ice \ FilesystemDB.ice \ - FilesystemI.cpp \ - Server.cpp + FilesystemI.cpp \ + Server.cpp $(test)_server_slice2freeze := IdentityFileEntryMap IdentityDirectoryEntryMap -$(test)_server_IdentityFileEntryMap := --dict FilesystemDB::IdentityFileEntryMap,Ice::Identity,FilesystemDB::FileEntry +$(test)_server_IdentityFileEntryMap := --dict FilesystemDB::IdentityFileEntryMap,Ice::Identity,FilesystemDB::FileEntry $(test)_server_IdentityFileEntryMap_slice := $(test)/FilesystemDB.ice $(ice_slicedir)/Ice/Identity.ice $(test)_server_IdentityDirectoryEntryMap := --dict FilesystemDB::IdentityDirectoryEntryMap,Ice::Identity,FilesystemDB::DirectoryEntry diff --git a/cpp/src/Freeze/Makefile.mk b/cpp/src/Freeze/Makefile.mk index 751a6642..1e06582e 100644 --- a/cpp/src/Freeze/Makefile.mk +++ b/cpp/src/Freeze/Makefile.mk @@ -5,20 +5,20 @@ # ********************************************************************** $(project)_libraries = Freeze -$(project)_generated_includedir := $(project)/generated/Freeze +$(project)_generated_includedir := $(project)/generated/Freeze Freeze_targetdir := $(libdir) Freeze_cppflags := -DFREEZE_API_EXPORTS Freeze_sliceflags := --include-dir Freeze -Freeze_dependencies := Ice +Freeze_dependencies := Ice Freeze_libs := db -Freeze_slice2freeze := Catalog CatalogIndexList +Freeze_slice2freeze := Catalog CatalogIndexList -Freeze_Catalog := --dict Freeze::Catalog,string,Freeze::CatalogData --dll-export FREEZE_API -Freeze_Catalog_slice := $(slicedir)/Freeze/CatalogData.ice +Freeze_Catalog := --dict Freeze::Catalog,string,Freeze::CatalogData --dll-export FREEZE_API +Freeze_Catalog_slice := $(slicedir)/Freeze/CatalogData.ice -Freeze_CatalogIndexList := --dict Freeze::CatalogIndexList,string,Ice::StringSeq --dll-export FREEZE_API -Freeze_CatalogIndexList_slice := $(ice_slicedir)/Ice/BuiltinSequences.ice +Freeze_CatalogIndexList := --dict Freeze::CatalogIndexList,string,Ice::StringSeq --dll-export FREEZE_API +Freeze_CatalogIndexList_slice := $(ice_slicedir)/Ice/BuiltinSequences.ice projects += $(project) diff --git a/cpp/src/Freeze/MapDb.cpp b/cpp/src/Freeze/MapDb.cpp index 554c076d..c51030ea 100644 --- a/cpp/src/Freeze/MapDb.cpp +++ b/cpp/src/Freeze/MapDb.cpp @@ -34,13 +34,13 @@ extern "C" static int customCompare(DB* db, const DBT* dbt1, const DBT* dbt2, size_t*) #endif { - MapDb* me = static_cast(db->app_private); - Ice::Byte* first = static_cast(dbt1->data); - Key k1(first, first + dbt1->size); - first = static_cast(dbt2->data); - Key k2(first, first + dbt2->size); + MapDb* me = static_cast(db->app_private); + Ice::Byte* first = static_cast(dbt1->data); + Key k1(first, first + dbt1->size); + first = static_cast(dbt2->data); + Key k2(first, first + dbt2->size); - return me->getKeyCompare()->compare(k1, k2); + return me->getKeyCompare()->compare(k1, k2); } } diff --git a/cpp/src/FreezeScript/Makefile.mk b/cpp/src/FreezeScript/Makefile.mk index c887928f..2663ff67 100644 --- a/cpp/src/FreezeScript/Makefile.mk +++ b/cpp/src/FreezeScript/Makefile.mk @@ -6,43 +6,43 @@ $(project)_programs = transformdb dumpdb -$(project)_dependencies = Freeze IceXML Ice -$(project)_libs = db mcpp +$(project)_dependencies = Freeze IceXML Ice +$(project)_libs = db mcpp $(project)_targetdir := $(bindir) -$(project)_bisonflags := --name-prefix "freeze_script_" - -common_sources = AssignVisitor.cpp \ - Data.cpp \ - Error.cpp \ - Exception.cpp \ - Functions.cpp \ - Print.cpp \ - Util.cpp \ - FSParser.cpp \ - FSScanner.l \ - FSGrammar.y - -transformdb_sources = $(common_sources) \ - TransformAnalyzer.cpp \ - TransformVisitor.cpp \ - Transformer.cpp \ - transformdb.cpp - -dumpdb_sources = $(common_sources) \ - DumpDescriptors.cpp \ - DumpDB.cpp - -slice_sources := $(filter-out %Util.cpp %Ruby.cpp %Python.cpp %MD5.cpp %MD5I.cpp\ +$(project)_bisonflags := --name-prefix "freeze_script_" + +common_sources = AssignVisitor.cpp \ + Data.cpp \ + Error.cpp \ + Exception.cpp \ + Functions.cpp \ + Print.cpp \ + Util.cpp \ + FSParser.cpp \ + FSScanner.l \ + FSGrammar.y + +transformdb_sources = $(common_sources) \ + TransformAnalyzer.cpp \ + TransformVisitor.cpp \ + Transformer.cpp \ + transformdb.cpp + +dumpdb_sources = $(common_sources) \ + DumpDescriptors.cpp \ + DumpDB.cpp + +slice_sources := $(filter-out %Util.cpp %Ruby.cpp %Python.cpp %MD5.cpp %MD5I.cpp\ %Checksum.cpp,\ - $(wildcard $(top_srcdir)/ice/cpp/src/Slice/*.cpp)) \ - $(top_srcdir)/cpp/src/Slice/SliceUtil.cpp \ - $(top_srcdir)/cpp/src/Slice/CPlusPlusUtil.cpp + $(wildcard $(top_srcdir)/ice/cpp/src/Slice/*.cpp)) \ + $(top_srcdir)/cpp/src/Slice/SliceUtil.cpp \ + $(top_srcdir)/cpp/src/Slice/CPlusPlusUtil.cpp -transformdb_sources := $(addprefix $(project)/,$(transformdb_sources)) \ - $(slice_sources) +transformdb_sources := $(addprefix $(project)/,$(transformdb_sources)) \ + $(slice_sources) -dumpdb_sources := $(addprefix $(project)/,$(dumpdb_sources)) \ - $(slice_sources) +dumpdb_sources := $(addprefix $(project)/,$(dumpdb_sources)) \ + $(slice_sources) projects += $(project) diff --git a/cpp/test/Freeze/complex/Makefile.mk b/cpp/test/Freeze/complex/Makefile.mk index 4c579bc7..8681d40e 100644 --- a/cpp/test/Freeze/complex/Makefile.mk +++ b/cpp/test/Freeze/complex/Makefile.mk @@ -4,14 +4,14 @@ # # ********************************************************************** -$(test)_client_sources := Complex.ice \ - Grammar.y \ - Scanner.l \ - Parser.cpp \ - Client.cpp +$(test)_client_sources := Complex.ice \ + Grammar.y \ + Scanner.l \ + Parser.cpp \ + Client.cpp $(test)_client_slice2freeze := ComplexDict -$(test)_client_ComplexDict := --dict Complex::ComplexDict,Complex::Key,Complex::Node -$(test)_client_ComplexDict_slice := $(test)/Complex.ice +$(test)_client_ComplexDict := --dict Complex::ComplexDict,Complex::Key,Complex::Node +$(test)_client_ComplexDict_slice := $(test)/Complex.ice tests += $(test) diff --git a/cpp/test/Freeze/dbmap/Makefile.mk b/cpp/test/Freeze/dbmap/Makefile.mk index 664a5099..ec083041 100644 --- a/cpp/test/Freeze/dbmap/Makefile.mk +++ b/cpp/test/Freeze/dbmap/Makefile.mk @@ -8,17 +8,17 @@ $(test)_client_slice2freeze := ByteIntMap IntIdentityMap IntIdentityMapWithIndex $(test)_client_ByteIntMap := --dict "Test::ByteIntMap,byte,int" --dict-index "Test::ByteIntMap,sort" -$(test)_client_IntIdentityMap := --dict "Test::IntIdentityMap,int,Ice::Identity" -$(test)_client_IntIdentityMap_slice := $(ice_slicedir)/Ice/Identity.ice +$(test)_client_IntIdentityMap := --dict "Test::IntIdentityMap,int,Ice::Identity" +$(test)_client_IntIdentityMap_slice := $(ice_slicedir)/Ice/Identity.ice -$(test)_client_IntIdentityMapWithIndex := --dict "Test::IntIdentityMapWithIndex,int,Ice::Identity" \ +$(test)_client_IntIdentityMapWithIndex := --dict "Test::IntIdentityMapWithIndex,int,Ice::Identity" \ --dict-index "Test::IntIdentityMapWithIndex,category" -$(test)_client_IntIdentityMapWithIndex_slice := $(ice_slicedir)/Ice/Identity.ice +$(test)_client_IntIdentityMapWithIndex_slice := $(ice_slicedir)/Ice/Identity.ice -$(test)_client_SortedMap := --dict "Test::SortedMap,int,Ice::Identity,sort" \ +$(test)_client_SortedMap := --dict "Test::SortedMap,int,Ice::Identity,sort" \ --dict-index "Test::SortedMap,category,sort,std::greater" -$(test)_client_SortedMap_slice := $(ice_slicedir)/Ice/Identity.ice +$(test)_client_SortedMap_slice := $(ice_slicedir)/Ice/Identity.ice -$(test)_client_WstringWstringMap := --dict 'Test::WstringWstringMap,["cpp:type:wstring"]string,["cpp:type:wstring"]string' \ +$(test)_client_WstringWstringMap := --dict 'Test::WstringWstringMap,["cpp:type:wstring"]string,["cpp:type:wstring"]string' \ --dict-index "Test::WstringWstringMap" tests += $(test) diff --git a/cpp/test/Freeze/fileLock/Makefile.mk b/cpp/test/Freeze/fileLock/Makefile.mk index 85a8acd7..89d138be 100644 --- a/cpp/test/Freeze/fileLock/Makefile.mk +++ b/cpp/test/Freeze/fileLock/Makefile.mk @@ -6,7 +6,7 @@ $(test)_programs := client clientFail -$(test)_client_sources := Client.cpp +$(test)_client_sources := Client.cpp $(test)_clientFail_sources := ClientFail.cpp tests += $(test) diff --git a/cpp/test/FreezeScript/dbmap/check.xml b/cpp/test/FreezeScript/dbmap/check.xml index 23403fa7..f32bdb1a 100644 --- a/cpp/test/FreezeScript/dbmap/check.xml +++ b/cpp/test/FreezeScript/dbmap/check.xml @@ -1,6 +1,6 @@ - + diff --git a/cpp/test/FreezeScript/dbmap/init.xml b/cpp/test/FreezeScript/dbmap/init.xml index 0d039d4c..d2853a4e 100644 --- a/cpp/test/FreezeScript/dbmap/init.xml +++ b/cpp/test/FreezeScript/dbmap/init.xml @@ -1,6 +1,6 @@ - + diff --git a/cpp/test/FreezeScript/evictor/check.xml b/cpp/test/FreezeScript/evictor/check.xml index 0a3ef26e..3934f504 100644 --- a/cpp/test/FreezeScript/evictor/check.xml +++ b/cpp/test/FreezeScript/evictor/check.xml @@ -2,7 +2,7 @@ - + diff --git a/cpp/test/FreezeScript/evictor/transform.xml b/cpp/test/FreezeScript/evictor/transform.xml index 1d98cb42..2c8efb1a 100644 --- a/cpp/test/FreezeScript/evictor/transform.xml +++ b/cpp/test/FreezeScript/evictor/transform.xml @@ -1,7 +1,7 @@ - + - + diff --git a/ice b/ice index 9cd47366..edd0468e 160000 --- a/ice +++ b/ice @@ -1 +1 @@ -Subproject commit 9cd4736682f76b22eb3e7e947a73171df2c86c32 +Subproject commit edd0468e76442e658d0abf3dbec67dc8688e84be diff --git a/java/src/Freeze/src/main/java/Freeze/FileLockException.java b/java/src/Freeze/src/main/java/Freeze/FileLockException.java index 7ce00447..96b7eda4 100644 --- a/java/src/Freeze/src/main/java/Freeze/FileLockException.java +++ b/java/src/Freeze/src/main/java/Freeze/FileLockException.java @@ -31,16 +31,16 @@ public FileLockException(String path, Throwable cause) @Override public FileLockException clone() { - FileLockException c = null; - try - { - c = (FileLockException)super.clone(); - } - catch(CloneNotSupportedException ex) - { - assert false; - } - return c; + FileLockException c = null; + try + { + c = (FileLockException)super.clone(); + } + catch(CloneNotSupportedException ex) + { + assert false; + } + return c; } public String