August 2008 - macruby-changes - lists.macosforge.org

[469] MacRuby/trunk/lib/hotcocoa
by source_changes＠macosforge.org 22 Aug '08

22 Aug '08

Revision: 469 http://trac.macosforge.org/projects/ruby/changeset/469 Author: rich(a)infoether.com Date: 2008-08-21 23:00:58 -0700 (Thu, 21 Aug 2008) Log Message: ----------- add vfs support, will support after 0.3 Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/application_builder.rb Added Paths: ----------- MacRuby/trunk/lib/hotcocoa/virtual_file_system.rb Modified: MacRuby/trunk/lib/hotcocoa/application_builder.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/application_builder.rb 2008-08-22 05:23:29 UTC (rev 468) +++ MacRuby/trunk/lib/hotcocoa/application_builder.rb 2008-08-22 06:00:58 UTC (rev 469) @@ -6,7 +6,7 @@ ApplicationBundlePackage = "APPL????" - attr_accessor :name, :load_file, :sources, :overwrite, :icon, :version, :info_string + attr_accessor :name, :load_file, :sources, :overwrite, :icon, :version, :info_string, :secure def self.build(build_options) build_options.each do |key, value| @@ -17,6 +17,7 @@ build_options = YAML.load(File.read(build_options[:file])) end ab = new + ab.secure = (build_options[:secure] == true) ab.name = build_options[:name] ab.load_file = build_options[:load] ab.icon = build_options[:icon] if build_options[:icon] && File.exist?(build_options[:icon]) @@ -52,6 +53,10 @@ end end + def secure? + secure + end + private def check_for_bundle_root @@ -79,11 +84,22 @@ end def copy_sources - FileUtils.cp_r load_file, resources_root unless sources.include?(load_file) - sources.each do |source| - destination = File.join(resources_root, source) - FileUtils.mkdir_p(File.dirname(destination)) unless File.exist?(File.dirname(destination)) - FileUtils.cp_r source, destination + if secure? + data = {} + data["/"+load_file] = File.open(load_file, "r") {|f| f.read} + sources.each do |source| + data["/"+source] = File.open(source, "r") {|f| f.read} + end + File.open(File.join(resources_root, "vfs.db"), "wb") do |db| + db.write Marshal.dump(data) + end + else + FileUtils.cp_r load_file, resources_root unless sources.include?(load_file) + sources.each do |source| + destination = File.join(resources_root, source) + FileUtils.mkdir_p(File.dirname(destination)) unless File.exist?(File.dirname(destination)) + FileUtils.cp_r source, destination + end end end @@ -146,10 +162,15 @@ def write_ruby_main File.open(main_ruby_source_file, "wb") do |f| - f.puts %{ - $:.unshift NSBundle.mainBundle.resourcePath.fileSystemRepresentation - load '#{load_file}' - } + if secure? + require 'hotcocoa/virtual_file_system' + f.puts VirtualFileSystem.code_to_load(load_file) + else + f.puts %{ + $:.unshift NSBundle.mainBundle.resourcePath.fileSystemRepresentation + load '#{load_file}' + } + end end end Added: MacRuby/trunk/lib/hotcocoa/virtual_file_system.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/virtual_file_system.rb (rev 0) +++ MacRuby/trunk/lib/hotcocoa/virtual_file_system.rb 2008-08-22 06:00:58 UTC (rev 469) @@ -0,0 +1,172 @@ +class VirtualFileSystem + + def self.code_to_load(main_file, password = "\320\302\354\024\215\360P\235\2244\261\214\276:'\274%\270<\350t\212\003\340\t'\004\345\334\256\315\277") + <<-VFS + module DatabaseRuntime + + class VirtualFilesystem + + attr_reader :password, :encryption_method + + def initialize(password, encryption_method="aes256") + @password = password + @encryption_method = encryption_method + end + + def open_database(main_database) + @main_database = main_database + begin + @db = Marshal.load(File.open(main_database, "rb") {|f| f.read}) + rescue + puts $! + puts $!.backtrace.join("\\n") + end + end + + def read_file_and_key(filename) + data, key = read_file_using_path(filename) + if data.nil? && filename[0,1] != "/" + $:.each do |loadpath| + data, key = read_file_using_path(filename, expand_path(loadpath)) + break if data + end + end + [data, key] + end + + def read_file_using_path(filename, pathname="/") + path = expand_path(File.join(pathname, filename)) + rb_ext = false + if has_key?(path) + key = filename + elsif self.has_key?(path+".rb") + key = filename+".rb" + rb_ext = true + end + if key + result = rb_ext ? self[path+".rb"] : self[path] + if result + result.gsub!(/__FILE__/, "'\#{path + (rb_ext ? ".rb" : '')}'") + return result, key + end + end + nil + end + + def has_key?(key) + @db.has_key?(key) + end + + def delete(key) + end + + def [](key) + read(@db, key) + end + + def close + end + + def keys + @db.keys + end + + def []=(key, value) + end + + def normalize(filename) + f = filename.split(File::Separator) + f.delete(".") + while f.include?("..") + f[f.index("..")-1,2] = [] + end + f.join(File::Separator) + end + + private + + def expand_path(filename, dirstring=nil) + filename = File.join(dirstring, filename) if dirstring + f = filename.split(File::Separator) + f.delete(".") + f.delete("") + while f.include?("..") + f[f.index("..")-1,2] = [] + end + "/"+f.join(File::Separator) + end + + + def read(db, key) + if db.has_key?(key) + #decrypt = OpenSSL::Cipher::Cipher.new(encryption_method) + #decrypt.decrypt + #decrypt.key = password + #data = decrypt.update(db[key]) + #data << decrypt.final + #::Zlib::Inflate.inflate(data) + db[key] + else + nil + end + end + + end + + end + + $ROOT_BINDING = binding + + module Kernel + + def virtual_filesystems(options) + vfs = DatabaseRuntime::VirtualFilesystem.new(options["password"]) + vfs.open_database(options["database"]) + Kernel.const_set("VIRTUAL_FILESYSTEM", vfs) + vfs + end + + alias_method :original_require, :require + + def require(path) + path = VIRTUAL_FILESYSTEM.normalize(path) + path_loaded = $".include?(path) || $".include?(path+".rb") || $".include?(path+".so") + unless path_loaded + data, key = VIRTUAL_FILESYSTEM.read_file_and_key(path) + if data + $" << key + eval(data, $ROOT_BINDING, key, 0) + return true + else + original_require(path) + end + else + return false + end + end + + alias_method :original_load, :load + + def load(path) + path = VIRTUAL_FILESYSTEM.normalize(path) + data, key = VIRTUAL_FILESYSTEM.read_file_and_key(path) + if data + eval(data, $ROOT_BINDING, key, 0) + return true + else + begin + original_load(path) + rescue LoadError => e + raise e + end + end + end + + end + + virtual_filesystems("database"=>File.join(NSBundle.mainBundle.resourcePath.fileSystemRepresentation, 'vfs.db'), "password"=>#{password.inspect}) + $:.unshift "/lib" + load '#{main_file}' + VFS + end +end \ No newline at end of file

1 0

[468] MacRuby/trunk/objc.m
by source_changes＠macosforge.org 22 Aug '08

22 Aug '08

Revision: 468 http://trac.macosforge.org/projects/ruby/changeset/468 Author: lsansonetti(a)apple.com Date: 2008-08-21 22:23:29 -0700 (Thu, 21 Aug 2008) Log Message: ----------- propagate alias methods to classes that include the module Modified Paths: -------------- MacRuby/trunk/objc.m Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2008-08-22 04:32:09 UTC (rev 467) +++ MacRuby/trunk/objc.m 2008-08-22 05:23:29 UTC (rev 468) @@ -1144,6 +1144,8 @@ SEL name_sel, def_sel; Method method, dest_method; bool redo = false; + VALUE included_in_classes; + int included_in_classes_count = -1; name_str = rb_id2name(name); def_str = rb_id2name(def); @@ -1151,6 +1153,8 @@ name_sel = sel_registerName(name_str); def_sel = sel_registerName(def_str); + included_in_classes = RCLASS_MODULE(klass) ? rb_attr_get(klass, idIncludedInClasses) : Qnil; + method = class_getInstanceMethod((Class)klass, def_sel); if (method == NULL) { size_t len = strlen(def_str); @@ -1173,6 +1177,29 @@ alias_method: +#define forward_method_definition(sel,imp,types) \ + do { \ + if (included_in_classes != Qnil) { \ + int i; \ + if (included_in_classes_count == -1) \ + included_in_classes_count = RARRAY_LEN(included_in_classes); \ + for (i = 0; i < included_in_classes_count; i++) { \ + VALUE k = RARRAY_AT(included_in_classes, i); \ + Method m = class_getInstanceMethod((Class)k, sel); \ + DLOG("DEFI", "-[%s %s]", class_getName((Class)k), (char *)sel); \ + if (m != NULL) { \ + Method m2 = class_getInstanceMethod((Class)RCLASS_SUPER(k), sel); \ + if (m != m2) { \ + method_setImplementation(m, imp); \ + break; \ + } \ + } \ + assert(class_addMethod((Class)k, sel, imp, types)); \ + } \ + } \ + } \ + while (0) + dest_method = class_getInstanceMethod((Class)klass, name_sel); DLOG("ALIAS", "%c[%s %s -> %s] types=%s direct_override=%d orig_node=%p", @@ -1187,6 +1214,7 @@ method_getImplementation(method), method_getTypeEncoding(method))); } + forward_method_definition(name_sel, method_getImplementation(method), method_getTypeEncoding(method)); if (!redo && name_str[strlen(name_str) - 1] != ':') { char buf[100]; @@ -1417,7 +1445,7 @@ VALUE included_in_classes; int included_in_classes_count = - 1; -#define forward_method_definition(ary,sel,imp,types) \ +#define forward_method_definition(sel,imp,types) \ do { \ if (included_in_classes != Qnil) { \ int i; \ @@ -1537,7 +1565,7 @@ else { assert(class_addMethod((Class)mod, sel, imp, types)); } - forward_method_definition(included_in_classes, sel, imp, types); + forward_method_definition(sel, imp, types); if (node != NULL) { const char *sel_str = (const char *)sel; @@ -1578,9 +1606,11 @@ else { assert(class_addMethod((Class)mod, new_sel, imp, new_types)); } - forward_method_definition(included_in_classes, new_sel, imp, new_types); + forward_method_definition(new_sel, imp, new_types); } } + +#undef forward_method_definition } static inline bool

1 0

[467] MacRuby/trunk
by source_changes＠macosforge.org 22 Aug '08

22 Aug '08

Revision: 467 http://trac.macosforge.org/projects/ruby/changeset/467 Author: lsansonetti(a)apple.com Date: 2008-08-21 21:32:09 -0700 (Thu, 21 Aug 2008) Log Message: ----------- adding status_bar example with mappings for status bar, item and speech synthesizer Added Paths: ----------- MacRuby/trunk/lib/hotcocoa/mappings/speech_synthesizer.rb MacRuby/trunk/lib/hotcocoa/mappings/status_bar.rb MacRuby/trunk/lib/hotcocoa/mappings/status_item.rb MacRuby/trunk/sample-macruby/HotCocoa/status_bar.rb Added: MacRuby/trunk/lib/hotcocoa/mappings/speech_synthesizer.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings/speech_synthesizer.rb (rev 0) +++ MacRuby/trunk/lib/hotcocoa/mappings/speech_synthesizer.rb 2008-08-22 04:32:09 UTC (rev 467) @@ -0,0 +1,25 @@ +HotCocoa::Mappings.map :speech_synthesizer => :NSSpeechSynthesizer do + + def init_with_options(obj, options) + if voice = options.delete(:voice) + obj.initWithVoice voice + else + obj.init + end + end + + custom_methods do + + def speak(what, to=nil) + if to + url = to.is_a?(String) ? NSURL.fileURLWithPath(to) : to + startSpeakingString(what, toURL:url) + else + startSpeakingString(what) + end + end + + end + +end + Added: MacRuby/trunk/lib/hotcocoa/mappings/status_bar.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings/status_bar.rb (rev 0) +++ MacRuby/trunk/lib/hotcocoa/mappings/status_bar.rb 2008-08-22 04:32:09 UTC (rev 467) @@ -0,0 +1,7 @@ +HotCocoa::Mappings.map :status_bar => :NSStatusBar do + + def alloc_with_options(options) + NSStatusBar.systemStatusBar + end + +end Added: MacRuby/trunk/lib/hotcocoa/mappings/status_item.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings/status_item.rb (rev 0) +++ MacRuby/trunk/lib/hotcocoa/mappings/status_item.rb 2008-08-22 04:32:09 UTC (rev 467) @@ -0,0 +1,9 @@ +HotCocoa::Mappings.map :status_item => :NSStatusItem do + + defaults :length => NSVariableStatusItemLength + + def alloc_with_options(options) + status_bar.statusItemWithLength options.delete(:length) + end + +end Added: MacRuby/trunk/sample-macruby/HotCocoa/status_bar.rb =================================================================== --- MacRuby/trunk/sample-macruby/HotCocoa/status_bar.rb (rev 0) +++ MacRuby/trunk/sample-macruby/HotCocoa/status_bar.rb 2008-08-22 04:32:09 UTC (rev 467) @@ -0,0 +1,12 @@ +require 'hotcocoa' +include HotCocoa + +application :name => 'Speak or Quit' do + m = menu do |main| + main.item :speak, + :on_action => proc { speech_synthesizer.speak('I have a lot to say.') } + main.item :quit, :key => 'q', :modifiers => [:command], + :on_action => proc { speech_synthesizer.speak('I have nothing more to say.') } + end + status_item :title => 'Speak or Quit', :menu => m +end

1 0

[466] MacRuby/trunk/lib/hotcocoa/mappings/button.rb
by source_changes＠macosforge.org 22 Aug '08

22 Aug '08

Revision: 466 http://trac.macosforge.org/projects/ruby/changeset/466 Author: lsansonetti(a)apple.com Date: 2008-08-21 21:31:42 -0700 (Thu, 21 Aug 2008) Log Message: ----------- do not include HotCocoa Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/mappings/button.rb Modified: MacRuby/trunk/lib/hotcocoa/mappings/button.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings/button.rb 2008-08-22 01:48:09 UTC (rev 465) +++ MacRuby/trunk/lib/hotcocoa/mappings/button.rb 2008-08-22 04:31:42 UTC (rev 466) @@ -1,6 +1,4 @@ -include HotCocoa - -Mappings.map :button => :NSButton do +HotCocoa::Mappings.map :button => :NSButton do defaults :bezel => :rounded, :frame => DefaultEmptyRect,

1 0

[465] MacRuby/trunk/vm_insnhelper.c
by source_changes＠macosforge.org 22 Aug '08

22 Aug '08

Revision: 465 http://trac.macosforge.org/projects/ruby/changeset/465 Author: lsansonetti(a)apple.com Date: 2008-08-21 18:48:09 -0700 (Thu, 21 Aug 2008) Log Message: ----------- when looking for potential super methods in modules, make sure we do not lookup in the module's superclass (NSObject typically) Modified Paths: -------------- MacRuby/trunk/vm_insnhelper.c Modified: MacRuby/trunk/vm_insnhelper.c =================================================================== --- MacRuby/trunk/vm_insnhelper.c 2008-08-21 21:19:40 UTC (rev 464) +++ MacRuby/trunk/vm_insnhelper.c 2008-08-22 01:48:09 UTC (rev 465) @@ -1404,7 +1404,11 @@ NODE *mn; IMP imp; SEL sel; + + VALUE saved_imod_super = RCLASS_SUPER(imod); + RCLASS_SUPER(imod) = 0; mn = rb_objc_method_node(imod, mid, &imp, &sel); + RCLASS_SUPER(imod) = saved_imod_super; if (imp != NULL) { previous_sklass = klass; *mnp = mn;

1 0

[464] MacRuby/trunk/data/hotcocoa_template
by source_changes＠macosforge.org 21 Aug '08

21 Aug '08

Revision: 464 http://trac.macosforge.org/projects/ruby/changeset/464 Author: rich(a)infoether.com Date: 2008-08-21 14:19:40 -0700 (Thu, 21 Aug 2008) Log Message: ----------- update template Modified Paths: -------------- MacRuby/trunk/data/hotcocoa_template/config/build.yml Added Paths: ----------- MacRuby/trunk/data/hotcocoa_template/resources/ MacRuby/trunk/data/hotcocoa_template/resources/HotCocoa.icns Modified: MacRuby/trunk/data/hotcocoa_template/config/build.yml =================================================================== --- MacRuby/trunk/data/hotcocoa_template/config/build.yml 2008-08-21 21:19:12 UTC (rev 463) +++ MacRuby/trunk/data/hotcocoa_template/config/build.yml 2008-08-21 21:19:40 UTC (rev 464) @@ -1,4 +1,6 @@ -:name: __APPLICATION_NAME__ -:load: lib/application.rb -:sources: +name: __APPLICATION_NAME__ +load: lib/application.rb +version: "1.0" +icon: resources/HotCocoa.icns +sources: - lib/**/*.rb Added: MacRuby/trunk/data/hotcocoa_template/resources/HotCocoa.icns =================================================================== (Binary files differ) Property changes on: MacRuby/trunk/data/hotcocoa_template/resources/HotCocoa.icns ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

1 0

[463] MacRuby/trunk/lib/hotcocoa/application_builder.rb
by source_changes＠macosforge.org 21 Aug '08

21 Aug '08

Revision: 463 http://trac.macosforge.org/projects/ruby/changeset/463 Author: rich(a)infoether.com Date: 2008-08-21 14:19:12 -0700 (Thu, 21 Aug 2008) Log Message: ----------- add icon support Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/application_builder.rb Modified: MacRuby/trunk/lib/hotcocoa/application_builder.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/application_builder.rb 2008-08-21 21:18:55 UTC (rev 462) +++ MacRuby/trunk/lib/hotcocoa/application_builder.rb 2008-08-21 21:19:12 UTC (rev 463) @@ -6,9 +6,12 @@ ApplicationBundlePackage = "APPL????" - attr_accessor :name, :load_file, :sources, :overwrite + attr_accessor :name, :load_file, :sources, :overwrite, :icon, :version, :info_string def self.build(build_options) + build_options.each do |key, value| + build_options[key.intern] = value if key.respond_to?(:intern) + end if build_options[:file] require 'yaml' build_options = YAML.load(File.read(build_options[:file])) @@ -16,6 +19,9 @@ ab = new ab.name = build_options[:name] ab.load_file = build_options[:load] + ab.icon = build_options[:icon] if build_options[:icon] && File.exist?(build_options[:icon]) + ab.version = build_options[:version] || "1.0" + ab.info_string = build_options[:info_string] ab.overwrite = (build_options.include?(:overwrite) ? build_options[:overwrite] : true) sources = build_options[:sources] || [] sources.each do |source| @@ -33,6 +39,7 @@ build_bundle_structure write_bundle_files copy_sources + copy_icon_file if icon end def overwrite? @@ -80,6 +87,10 @@ end end + def copy_icon_file + FileUtils.cp(icon, icon_file) + end + def write_pkg_info_file File.open(pkg_info_file, "wb") {|f| f.write ApplicationBundlePackage} end @@ -91,7 +102,11 @@ f.puts %{<plist version="1.0">} f.puts %{<dict>} f.puts %{ <key>CFBundleDevelopmentRegion</key>} - f.puts %{ <string>English</string>} + f.puts %{ <string>English</string>} + f.puts %{ <key>CFBundleIconFile</key>} if icon + f.puts %{ <string>#{name}.icns</string>} if icon + f.puts %{ <key>CFBundleGetInfoString</key>} if info_string + f.puts %{ <string>#{info_string}</string>} if info_string f.puts %{ <key>CFBundleExecutable</key>} f.puts %{ <string>#{name.gsub(/ /, '')}</string>} f.puts %{ <key>CFBundleIdentifier</key>} @@ -105,7 +120,7 @@ f.puts %{ <key>CFBundleSignature</key>} f.puts %{ <string>????</string>} f.puts %{ <key>CFBundleVersion</key>} - f.puts %{ <string>1.0</string>} + f.puts %{ <string>#{version}</string>} f.puts %{ <key>NSPrincipalClass</key>} f.puts %{ <string>NSApplication</string>} f.puts %{</dict>} @@ -158,6 +173,10 @@ File.join(contents_root, "Info.plist") end + def icon_file + File.join(resources_root, "#{name}.icns") + end + def pkg_info_file File.join(contents_root, "PkgInfo") end

1 0

[462] MacRuby/trunk/sample-macruby/HotCocoa
by source_changes＠macosforge.org 21 Aug '08

21 Aug '08

Revision: 462 http://trac.macosforge.org/projects/ruby/changeset/462 Author: rich(a)infoether.com Date: 2008-08-21 14:18:55 -0700 (Thu, 21 Aug 2008) Log Message: ----------- change to strings as keys Modified Paths: -------------- MacRuby/trunk/sample-macruby/HotCocoa/calculator/config/build.yml MacRuby/trunk/sample-macruby/HotCocoa/demo/config/build.yml Modified: MacRuby/trunk/sample-macruby/HotCocoa/calculator/config/build.yml =================================================================== --- MacRuby/trunk/sample-macruby/HotCocoa/calculator/config/build.yml 2008-08-21 06:13:50 UTC (rev 461) +++ MacRuby/trunk/sample-macruby/HotCocoa/calculator/config/build.yml 2008-08-21 21:18:55 UTC (rev 462) @@ -1,6 +1,6 @@ -:name: Calculator -:load: lib/application.rb -:version: "1.0" -:icon: /Applications/Calculator.app/Contents/Resources/Calculator.icns -:sources: +name: Calculator +load: lib/application.rb +version: "1.0" +icon: /Applications/Calculator.app/Contents/Resources/Calculator.icns +sources: - lib/**/*.rb Modified: MacRuby/trunk/sample-macruby/HotCocoa/demo/config/build.yml =================================================================== --- MacRuby/trunk/sample-macruby/HotCocoa/demo/config/build.yml 2008-08-21 06:13:50 UTC (rev 461) +++ MacRuby/trunk/sample-macruby/HotCocoa/demo/config/build.yml 2008-08-21 21:18:55 UTC (rev 462) @@ -1,6 +1,6 @@ -:name: Demo -:load: lib/application.rb -:version: "1.0" -:icon: resources/HotCocoa.icns -:sources: +name: Demo +load: lib/application.rb +version: "1.0" +icon: resources/HotCocoa.icns +sources: - lib/**/*.rb

1 0

[461] MacRuby/trunk/sample-macruby/RubyCocoa/
by source_changes＠macosforge.org 21 Aug '08

21 Aug '08

Revision: 461 http://trac.macosforge.org/projects/ruby/changeset/461 Author: lsansonetti(a)apple.com Date: 2008-08-20 23:13:50 -0700 (Wed, 20 Aug 2008) Log Message: ----------- removing rubycocoa samples Removed Paths: ------------- MacRuby/trunk/sample-macruby/RubyCocoa/

1 0

[460] MacRuby/trunk/benchmark/bm_vm3_gc.rb
by source_changes＠macosforge.org 21 Aug '08

21 Aug '08

Revision: 460 http://trac.macosforge.org/projects/ruby/changeset/460 Author: lsansonetti(a)apple.com Date: 2008-08-20 23:13:34 -0700 (Wed, 20 Aug 2008) Log Message: ----------- adding missing file Added Paths: ----------- MacRuby/trunk/benchmark/bm_vm3_gc.rb Added: MacRuby/trunk/benchmark/bm_vm3_gc.rb =================================================================== --- MacRuby/trunk/benchmark/bm_vm3_gc.rb (rev 0) +++ MacRuby/trunk/benchmark/bm_vm3_gc.rb 2008-08-21 06:13:34 UTC (rev 460) @@ -0,0 +1,7 @@ +#! /usr/bin/ruby +5000.times do + 100.times do + {"xxxx"=>"yyyy"} + end + GC.start +end Property changes on: MacRuby/trunk/benchmark/bm_vm3_gc.rb ___________________________________________________________________ Name: svn:executable + *

1 0