March 2009 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] <sat-solver> master : find module and class (vs. instance) methods and comments
by Klaus Kämpf 25 Mar '09

25 Mar '09

ref: refs/heads/master commit cd8d539686577d7b1213b22adf469e4862cc9938 Author: Klaus Kämpf <kkaempf(a)suse.de> Date: Wed Mar 25 14:22:43 2009 +0100 find module and class (vs. instance) methods and comments --- bindings/ruby/parse_swig.rb | 39 +++++++++++++++++++++++++++------------ 1 files changed, 27 insertions(+), 12 deletions(-) diff --git a/bindings/ruby/parse_swig.rb b/bindings/ruby/parse_swig.rb index d56bbfe..e6421f6 100644 --- a/bindings/ruby/parse_swig.rb +++ b/bindings/ruby/parse_swig.rb @@ -1,4 +1,3 @@ - # parse_swig.rb # # A rdoc parser for SWIG .i files @@ -99,6 +98,7 @@ module RDoc remove_commented_out_lines if module_name = do_module @@module_name = module_name + do_methods module_name else do_classes @classes.keys.each do |c| @@ -290,10 +290,18 @@ module RDoc # and honor # %rename "+new_name+" +old_name+ ; # + # Module level methods have 'static' prototypes of C functions. + # e.g. static type name(args); + # + def do_methods class_name renames = Hash.new c = find_class class_name - c.body.scan(%r{%rename\s*$\s*"([^"]+)"\s*$\s*(\w+)}m) do #" + + body = c.body || @body + extend_name = c.extend_name + + body.scan(%r{%rename\s*$\s*"([^"]+)"\s*$\s*(\w+)}m) do #" |meth_name,orig_name| meth_name = meth_name.to_s orig_name = orig_name.to_s @@ -303,17 +311,25 @@ module RDoc # <type> [*]? <name> ( <args> ) { # # puts "#{module_name}::#{class_name} methods ?" - c = find_class class_name - # Find constructor as 'new' - c.body.scan(%r{^\s+#{c.extend_name}\s*$([^$]*)\)\s*\{}m) do + + # Find class constructor as 'new' + body.scan(%r{^\s+#{extend_name}\s*$([^$]*)\)\s*\{}m) do |args| handle_method(class_name, class_name, "initialize", nil, (args.to_s.split(",")||[]).size, nil) + end if extend_name + + body.scan(%r{static\s+((const\s+)?\w+)(\W+)(\w+)\s*$([^$]*)\)\s*;}m) do + |const,type,pointer,meth_name,args| +# puts "-> const #{const}:type #{type}:pointer #{pointer}:name #{meth_name} (args #{args} )\n#{$&}\n\n" + meth_name = orig_name = meth_name.to_s + meth_name = renames[meth_name] || meth_name + handle_method(type, class_name||@@module_name, meth_name, nil, (args.split(",")||[]).size, orig_name) end - c.body.scan(%r{^\s+((const\s+)?\w+)(\W+)(\w+)\s*$([^$]*)\)\s*\{}m) do - |type,const,pointer,meth_name,args| + body.scan(%r{((const\s+)?\w+)([^~/\w]+)(\w+)\s*$([^$]*)\)\s*\{}m) do + |const,type,pointer,meth_name,args| next unless meth_name type = "string" if type =~ /char/ && pointer =~ /\*/ -# puts "-> #{const}:#{type}:#{pointer}:#{meth_name} ( #{args} )\n#{$&}\n\n" + puts "-> const #{const}:type #{type}:pointer #{pointer}:name #{meth_name} (args #{args} )\n#{$&}\n\n" if meth_name == "_WsXmlDoc" meth_name = orig_name = meth_name.to_s meth_name = renames[meth_name] || meth_name handle_method(type, class_name, meth_name, nil, (args.split(",")||[]).size, orig_name) @@ -450,13 +466,13 @@ module RDoc def handle_method(type, class_name, meth_name, meth_body, param_count, orig_name) progress(".") - class_obj = find_class(class_name) return nil unless class_obj seen_before = class_obj.method_list.find { |meth| meth.name == meth_name } return nil if seen_before + @stats.num_methods += 1 if meth_name == "initialize" meth_name = "new" @@ -478,7 +494,7 @@ module RDoc ")" end - body = find_class(class_name).body + body = find_class(class_name).body || @body if find_body(class_name, meth_name, meth_obj, body) and meth_obj.document_self class_obj.add_method(meth_obj) @@ -490,9 +506,8 @@ module RDoc # Find the C code corresponding to a Ruby method def find_body(class_name, meth_name, meth_obj, body, quiet = false) - case body - when %r{((?>/\*.*?\*/\s*))(?:const\s+)?(\w+)[\s\*]+#{meth_obj.orig_name || meth_name} + when %r{((?>/\*.*?\*/\s*))(?:static\s+)?(?:const\s+)?(\w+)[\s\*]+#{meth_obj.orig_name || meth_name} \s*($.*?$).*?^}xm comment, params = $1, $2 body_text = $& -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <zypper> master : Fixed enless loop in word-longer-than-screen case.
by Ján Kupec 25 Mar '09

25 Mar '09

ref: refs/heads/master commit d81b5c6d70a6463cb4d03e9139158cd5cb37ae8b Author: Ján Kupec <jkupec(a)suse.cz> Date: Wed Mar 25 14:16:37 2009 +0100 Fixed enless loop in word-longer-than-screen case. --- src/utils/text.cc | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/src/utils/text.cc b/src/utils/text.cc index e58a32e..cc01d59 100644 --- a/src/utils/text.cc +++ b/src/utils/text.cc @@ -109,11 +109,26 @@ void wrap_text(ostream & out, const string & text, // current wc exceeded the wrap width if (col > wrap_width) { + bool wanthyphen = false; + // A single word is longer than the wrap width. Split the word and + // append a hyphen at the end of the line. This won't normally happen, + // but it can eventually happen e.g. with paths or too low screen widths. + //! \todo make word-splitting more intelligent, e.g. if the word already + //! contains a hyphen, split there; do not split because + //! of a non-alphabet character; do not leave orphans, etc... + if (linep == prevwp) + { + prevwp = s - 2; + wanthyphen = true; + } + // update the size of the string to read s_bytes -= (prevwp - linep); // print the line, leave linep point to the start of the last word. for (; linep < prevwp; ++linep) out << *linep; + if (wanthyphen) + out << "-"; out << endl; // reset column counter col = 0; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <sat-solver> master : provide 'Solver.sizechange' to compute the changes of the installed
by Klaus Kämpf 25 Mar '09

25 Mar '09

ref: refs/heads/master commit 04415ce3689d2dc45874ae0f7f9d71f2578eb9b2 Author: Klaus Kämpf <kkaempf(a)suse.de> Date: Wed Mar 25 11:14:48 2009 +0100 provide 'Solver.sizechange' to compute the changes of the installed size after a transaction is applied. --- bindings/ruby/tests/solver.rb | 2 ++ bindings/solver.i | 12 ++++++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/bindings/ruby/tests/solver.rb b/bindings/ruby/tests/solver.rb index 81cc606..104c573 100644 --- a/bindings/ruby/tests/solver.rb +++ b/bindings/ruby/tests/solver.rb @@ -25,6 +25,8 @@ class SolverTest < Test::Unit::TestCase assert solver.allow_uninstall pool.prepare solver.solve( transaction ) + assert solver.sizechange + puts "Size change #{solver.sizechange}" solver.each_to_install { |s| puts "Install #{s}" } diff --git a/bindings/solver.i b/bindings/solver.i index 3bc9748..313c103 100644 --- a/bindings/solver.i +++ b/bindings/solver.i @@ -837,6 +837,18 @@ typedef struct solver {} Solver; #endif /* + * Return the size change of the installed system + * + * This is how much disk space gets allocated/freed after the + * solver decisions are applied to the system. + * + */ + long sizechange() + { + return solver_calc_installsizechange($self); + } + + /* * Document-method; explain * * Explain a decision -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <sat-solver> master : Add extend_name to NormalModule
by Klaus Kämpf 24 Mar '09

24 Mar '09

ref: refs/heads/master commit cf4215e4c7b841fdd85935ad6c3c8254bb46d177 Author: Klaus Kämpf <kkaempf(a)suse.de> Date: Tue Mar 24 19:04:46 2009 +0100 Add extend_name to NormalModule This completes the %rename/%extend dance we already implemented for NormalClass --- bindings/ruby/parse_swig.rb | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/bindings/ruby/parse_swig.rb b/bindings/ruby/parse_swig.rb index 0f360dc..d56bbfe 100644 --- a/bindings/ruby/parse_swig.rb +++ b/bindings/ruby/parse_swig.rb @@ -59,6 +59,10 @@ module RDoc attr_accessor :extend_name end + class NormalModule + attr_accessor :extend_name + end + class AnyMethod attr_accessor :orig_name end @@ -189,7 +193,7 @@ module RDoc # def find_class_comment(class_name, class_meth) - puts "find_class_comment(#{class_name}, #{class_meth.extend_name})" +# puts "find_class_comment(#{class_name}, #{class_meth.extend_name})" comment = nil if @body =~ %r{((?>/\*.*?\*/\s+)) %extend\s+#{class_meth.extend_name}\s*\{}xm -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <sat-solver> master : Find correct class comment
by Klaus Kämpf 24 Mar '09

24 Mar '09

ref: refs/heads/master commit 3fed7f99ae1e8cf8c4f8a08d786ef9cff3109f08 Author: Klaus Kämpf <kkaempf(a)suse.de> Date: Tue Mar 24 18:42:03 2009 +0100 Find correct class comment If class names are %renamed to better match the naming rules of the target language, the %extend directive and its associated comment still name the original class name. Introduce an 'extend_name' attribute to class objects to track the name used in %extend directives. --- bindings/ruby/parse_swig.rb | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/bindings/ruby/parse_swig.rb b/bindings/ruby/parse_swig.rb index f485c70..0f360dc 100644 --- a/bindings/ruby/parse_swig.rb +++ b/bindings/ruby/parse_swig.rb @@ -166,7 +166,8 @@ module RDoc end cm.record_location(enclosure.toplevel) cm.body = options[:content] - + cm.extend_name = options[:extend_name] || class_name + find_class_comment(class_name, cm) @classes[class_name] = cm @known_classes[class_name] = cm.full_name @@ -188,10 +189,10 @@ module RDoc # def find_class_comment(class_name, class_meth) -# puts "find_class_comment(#{class_name}, #{class_meth})" + puts "find_class_comment(#{class_name}, #{class_meth.extend_name})" comment = nil if @body =~ %r{((?>/\*.*?\*/\s+)) - %extend\s+#{class_name}\s*\{}xm + %extend\s+#{class_meth.extend_name}\s*\{}xm comment = $1 elsif @body =~ %r{Document-(class|module):\s#{class_name}\s*?\n((?>.*?\*/))}m comment = $2 @@ -231,9 +232,9 @@ module RDoc extends = Hash.new @body.scan(/^%rename\s*$([^\"$]+)\)\s+([_\w]+);/) do |class_name, struct_name| # puts "rename #{class_name} -> #{struct_name}" - extend_name = struct_name + extend_name = struct_name.to_s @body.scan(/typedef\s+struct\s+#{struct_name}\s*\{[^}]*\}\s*(\w+);/) do |ename| - extend_name = ename + extend_name = ename.to_s end # puts "extend #{extend_name}, class #{class_name}, struct #{struct_name}" @@ -243,11 +244,10 @@ module RDoc while content.to_s =~ /^%extend/ content = $` # discard %extend and everything behind end - extends[extend_name.to_s] = true + extends[extend_name] = true cn = class_name.to_s cn.capitalize! unless cn[0,1] =~ /[A-Z_]/ - swig_class = handle_class_module("class", cn, :parent => "rb_cObject", :content => content.to_s) - swig_class.extend_name = extend_name.to_s + swig_class = handle_class_module("class", cn, :parent => "rb_cObject", :content => content.to_s, :extend_name => extend_name) end end @body.scan(/^%extend\s*(\w+)\s*\{(.*)\}/mx) do |class_name,content| @@ -257,7 +257,6 @@ module RDoc cn.capitalize! unless cn[0,1] =~ /[A-Z_]/ swig_class = handle_class_module("class", cn, :parent => "rb_cObject", :content => content) extends[cn] = true - swig_class.extend_name = cn end end end -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <sat-solver> master : Find the right comment of a renamed method
by Klaus Kämpf 24 Mar '09

24 Mar '09

ref: refs/heads/master commit 288f928eb1a363cf3212e5ba8cc58bee87574488 Author: Klaus Kämpf <kkaempf(a)suse.de> Date: Tue Mar 24 18:19:13 2009 +0100 Find the right comment of a renamed method %rename() directives for class methods were not correctly tracked. Now we add an 'orig_name' attribute to methods to track the original name. --- bindings/ruby/parse_swig.rb | 74 +++++++++++++++++++++++------------------- 1 files changed, 40 insertions(+), 34 deletions(-) diff --git a/bindings/ruby/parse_swig.rb b/bindings/ruby/parse_swig.rb index d99c93b..f485c70 100644 --- a/bindings/ruby/parse_swig.rb +++ b/bindings/ruby/parse_swig.rb @@ -1,4 +1,4 @@ -# + # parse_swig.rb # # A rdoc parser for SWIG .i files @@ -59,6 +59,10 @@ module RDoc attr_accessor :extend_name end + class AnyMethod + attr_accessor :orig_name + end + class Swig_Parser attr_accessor :progress @@ -300,16 +304,16 @@ module RDoc # Find constructor as 'new' c.body.scan(%r{^\s+#{c.extend_name}\s*$([^$]*)\)\s*\{}m) do |args| - handle_method(class_name, class_name, "initialize", nil, (args.to_s.split(",")||[]).size) + handle_method(class_name, class_name, "initialize", nil, (args.to_s.split(",")||[]).size, nil) end c.body.scan(%r{^\s+((const\s+)?\w+)(\W+)(\w+)\s*$([^$]*)\)\s*\{}m) do |type,const,pointer,meth_name,args| next unless meth_name type = "string" if type =~ /char/ && pointer =~ /\*/ # puts "-> #{const}:#{type}:#{pointer}:#{meth_name} ( #{args} )\n#{$&}\n\n" - meth_name = meth_name.to_s + meth_name = orig_name = meth_name.to_s meth_name = renames[meth_name] || meth_name - handle_method(type, class_name, meth_name, nil, (args.split(",")||[]).size) + handle_method(type, class_name, meth_name, nil, (args.split(",")||[]).size, orig_name) end end @@ -441,49 +445,51 @@ module RDoc ########################################################### def handle_method(type, class_name, meth_name, - meth_body, param_count) + meth_body, param_count, orig_name) progress(".") class_obj = find_class(class_name) - if class_obj - seen_before = class_obj.method_list.find { |meth| meth.name == meth_name } - return if seen_before - @stats.num_methods += 1 - if meth_name == "initialize" - meth_name = "new" - type = "singleton_method" - end - meth_obj = AnyMethod.new("", meth_name) - meth_obj.singleton = - %w{singleton_method module_function}.include?(type) - - p_count = (Integer(param_count) rescue -1) - - if p_count < 0 - meth_obj.params = "(...)" - elsif p_count == 0 - meth_obj.params = "()" - else - meth_obj.params = "(" + + return nil unless class_obj + + seen_before = class_obj.method_list.find { |meth| meth.name == meth_name } + return nil if seen_before + @stats.num_methods += 1 + if meth_name == "initialize" + meth_name = "new" + type = "singleton_method" + end + meth_obj = AnyMethod.new("", meth_name) + meth_obj.singleton = %w{singleton_method module_function}.include?(type) + meth_obj.orig_name = orig_name || meth_name + + p_count = (Integer(param_count) rescue -1) + + if p_count < 0 + meth_obj.params = "(...)" + elsif p_count == 0 + meth_obj.params = "()" + else + meth_obj.params = "(" + (1..p_count).map{|i| "p#{i}"}.join(", ") + - ")" - end - - body = find_class(class_name).body - - if find_body(class_name, meth_name, meth_obj, body) and meth_obj.document_self - class_obj.add_method(meth_obj) - end + ")" end + + body = find_class(class_name).body + + if find_body(class_name, meth_name, meth_obj, body) and meth_obj.document_self + class_obj.add_method(meth_obj) + end + meth_obj end ############################################################ # Find the C code corresponding to a Ruby method def find_body(class_name, meth_name, meth_obj, body, quiet = false) + case body - when %r{((?>/\*.*?\*/\s*))(?:const\s+)?(\w+)[\s\*]+#{meth_name} + when %r{((?>/\*.*?\*/\s*))(?:const\s+)?(\w+)[\s\*]+#{meth_obj.orig_name || meth_name} \s*($.*?$).*?^}xm comment, params = $1, $2 body_text = $& -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <sat-solver> master : Fix finding the constructor
by Klaus Kämpf 24 Mar '09

24 Mar '09

ref: refs/heads/master commit 2e3ee8a438e7722b655e86f3d6ee7c3e31371442 Author: Klaus Kämpf <kkaempf(a)suse.de> Date: Tue Mar 24 16:58:03 2009 +0100 Fix finding the constructor --- bindings/ruby/parse_swig.rb | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/bindings/ruby/parse_swig.rb b/bindings/ruby/parse_swig.rb index 66d0bdf..d99c93b 100644 --- a/bindings/ruby/parse_swig.rb +++ b/bindings/ruby/parse_swig.rb @@ -55,6 +55,10 @@ module RDoc attr_accessor :body end + class NormalClass + attr_accessor :extend_name + end + class Swig_Parser attr_accessor :progress @@ -162,6 +166,7 @@ module RDoc find_class_comment(class_name, cm) @classes[class_name] = cm @known_classes[class_name] = cm.full_name + cm end ## @@ -203,6 +208,7 @@ module RDoc module_name = name.to_s module_name.capitalize! unless module_name[0,1] =~ /[A-Z_]/ handle_class_module("module", module_name) + break end module_name end @@ -237,6 +243,7 @@ module RDoc cn = class_name.to_s cn.capitalize! unless cn[0,1] =~ /[A-Z_]/ swig_class = handle_class_module("class", cn, :parent => "rb_cObject", :content => content.to_s) + swig_class.extend_name = extend_name.to_s end end @body.scan(/^%extend\s*(\w+)\s*\{(.*)\}/mx) do |class_name,content| @@ -244,8 +251,9 @@ module RDoc unless extends[cn] puts "Class #{cn}" cn.capitalize! unless cn[0,1] =~ /[A-Z_]/ - handle_class_module("class", cn, :parent => "rb_cObject", :content => content) + swig_class = handle_class_module("class", cn, :parent => "rb_cObject", :content => content) extends[cn] = true + swig_class.extend_name = cn end end end @@ -290,7 +298,7 @@ module RDoc # puts "#{module_name}::#{class_name} methods ?" c = find_class class_name # Find constructor as 'new' - c.body.scan(%r{^\s+#{class_name}\s*$([^$]*)\)\s*\{}m) do + c.body.scan(%r{^\s+#{c.extend_name}\s*$([^$]*)\)\s*\{}m) do |args| handle_method(class_name, class_name, "initialize", nil, (args.to_s.split(",")||[]).size) end @@ -515,12 +523,17 @@ module RDoc return false end else - if (meth_name == "new") && body =~ %r{((?>/\*.*?\*/\s*))\s*#{class_name}\s*($[^)]*$)}xm - comment = $1 - find_modifiers(comment, meth_obj) - meth_obj.comment = mangle_comment(comment) + meth_obj.comment - # No body, but might still have an override comment - comment = find_override_comment(meth_obj.name) + + if (meth_name == "new") + # find constructor definition + extend_name = find_class(class_name).extend_name + if body =~ %r{((?>/\*.*?\*/\s*))\s*#{extend_name}\s*($[^)]*$)}xm + comment = $1 + find_modifiers(comment, meth_obj) + meth_obj.comment = mangle_comment(comment) + meth_obj.comment + # No body, but might still have an override comment + comment = find_override_comment(meth_obj.name) + end end if comment find_modifiers(comment, meth_obj) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <zypper> master : Text processing functions added.
by Ján Kupec 24 Mar '09

24 Mar '09

ref: refs/heads/master commit c8a01e4463c302bf9a8fa076b763afffba3d6084 Author: Ján Kupec <jkupec(a)suse.cz> Date: Tue Mar 24 12:07:08 2009 +0100 Text processing functions added. - string_to_columns() taken out of Table to text.h - get_screen_width() taken out of Table to misc.h - wrap_text() added to text.h --- src/CMakeLists.txt | 2 + src/Table.cc | 72 ++------------------------ src/utils/misc.cc | 23 ++++++++ src/utils/misc.h | 16 ++++-- src/utils/text.cc | 143 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/utils/text.h | 25 +++++++++ 6 files changed, 210 insertions(+), 71 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 18229f8..dae4a9f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -68,6 +68,7 @@ SET( zypper_utils_HEADERS utils/pager.h utils/prompt.h utils/richtext.h + utils/text.h ) SET( zypper_utils_SRCS @@ -79,6 +80,7 @@ SET( zypper_utils_SRCS utils/pager.cc utils/prompt.cc utils/richtext.cc + utils/text.cc ${zypper_utils_HEADERS} ) diff --git a/src/Table.cc b/src/Table.cc index cdaa4be..921a0c6 100644 --- a/src/Table.cc +++ b/src/Table.cc @@ -2,10 +2,12 @@ #include <cstring> #include <cstdlib> #include <readline/readline.h> -#include <wchar.h> #include "zypp/base/Logger.h" +#include "utils/misc.h" +#include "utils/text.h" + #include "Table.h" // libzypp logger settings @@ -31,50 +33,6 @@ const char * lines[][3] = { { "\xE2\x95\x91", "\xE2\x94\x80", "\xE2\x95\xAB"}, ///< v double, h light }; -// A non-ASCII string has 3 different lengths: -// - bytes -// - characters (non-ASCII ones have multiple bytes in UTF-8) -// - columns (Chinese characters are 2 columns wide) -// In #328918 see how confusing these leads to misalignment. - -// return the number of columns in str, or -1 if there's an error -static -int string_to_columns_e (const string& str) { - // from smpppd.src.rpm/format.cc, thanks arvin - - const char* ptr = str.c_str (); - size_t s_bytes = str.length (); - int s_cols = 0; - - mbstate_t shift_state; - memset (&shift_state, 0, sizeof (shift_state)); - - wchar_t wc; - size_t c_bytes; - - // mbrtowc produces one wide character from a multibyte string - while ((c_bytes = mbrtowc (&wc, ptr, s_bytes, &shift_state)) > 0) { - if (c_bytes >= (size_t) -2) // incomplete (-2) or invalid (-1) sequence - return -1; - - s_cols += wcwidth (wc); - - s_bytes -= c_bytes; - ptr += c_bytes; - } - - return s_cols; -} - -static -unsigned string_to_columns (const string& str) { - int c = string_to_columns_e (str); - if (c < 0) - return str.length(); // fallback if there was an error - else - return (unsigned) c; -} - void TableRow::add (const string& s) { _columns.push_back (s); } @@ -136,27 +94,9 @@ Table::Table() : _has_header (false), _max_col (0), _width(0), - _style (defaultStyle) -{ - //! \todo move this to utils - - const char *cols_env = getenv("COLUMNS"); - if (cols_env) - _screen_width = ::atoi (cols_env); - else - { - ::rl_initialize(); - //::rl_reset_screen_size(); - ::rl_get_screen_size (NULL, &_screen_width); - DBG << "readline says we have " << _screen_width << " char wide console screen" << endl; - } - - // safe default - if (!_screen_width) - _screen_width = 80; - - DBG << "got screen width of " << _screen_width << endl; -} + _style (defaultStyle), + _screen_width(get_screen_width()) +{} void Table::add (const TableRow& tr) { _rows.push_back (tr); diff --git a/src/utils/misc.cc b/src/utils/misc.cc index 04ab29f..83d0d04 100644 --- a/src/utils/misc.cc +++ b/src/utils/misc.cc @@ -59,6 +59,29 @@ string readline_getline() // ---------------------------------------------------------------------------- +unsigned get_screen_width() +{ + int width = 80; + + const char *cols_env = getenv("COLUMNS"); + if (cols_env) + width = ::atoi (cols_env); + else + { + ::rl_initialize(); + //::rl_reset_screen_size(); + ::rl_get_screen_size (NULL, &width); + } + + // safe default + if (!width) + width = 80; + + return width; +} + +// ---------------------------------------------------------------------------- + bool is_changeable_media(const zypp::Url & url) { MIL << "Checking if this is a changeable medium" << endl; diff --git a/src/utils/misc.h b/src/utils/misc.h index ffc3088..67f9b7f 100644 --- a/src/utils/misc.h +++ b/src/utils/misc.h @@ -34,6 +34,12 @@ typedef std::set<zypp::ResKind> ResKindSet; std::string readline_getline(); +/** + * Reads COLUMNS environment variable or gets the screen width from readline, + * in that order. Falls back to 80 if all that fails. + */ +unsigned get_screen_width(); + bool is_changeable_media(const zypp::Url & url); std::string kind_to_string_localized( @@ -47,29 +53,29 @@ bool equalNVRA(const zypp::Resolvable & lhs, const zypp::Resolvable & rhs); * Creates a Url out of \a urls_s. If the url_s looks looks_like_url() * Url(url_s) is returned. Otherwise if \a url_s represends a valid path to * a file or directory, a dir:// Url is returned. Otherwise an empty Url is - * returned. + * returned. */ zypp::Url make_url (const std::string & url_s); /** * Returns <code>true</code> if the string \a s contains a substring starting * at the beginning and ending before the first colon matches any of registered - * schemes (Url::isRegisteredScheme()). + * schemes (Url::isRegisteredScheme()). */ bool looks_like_url (const std::string& s); /** * Returns <code>true</code> if \a s ends with ".rpm" or starts with "/", "./", - * or "../". + * or "../". */ bool looks_like_rpm_file(const std::string & s); /** * Download the RPM file specified by \a rpm_uri_str and copy it into * \a cache_dir. - * + * * \return The local Pathname of the file in the cache on success, empty - * Pathname if a problem occurs. + * Pathname if a problem occurs. */ zypp::Pathname cache_rpm(const std::string & rpm_uri_str, const std::string & cache_dir); diff --git a/src/utils/text.cc b/src/utils/text.cc new file mode 100644 index 0000000..e58a32e --- /dev/null +++ b/src/utils/text.cc @@ -0,0 +1,143 @@ +/*---------------------------------------------------------------------------*\ + ____ _ _ __ _ __ ___ _ _ + |_ / || | '_ \ '_ \/ -_) '_| + /__|\_, | .__/ .__/\___|_| + |__/|_| |_| +\*---------------------------------------------------------------------------*/ + +#include <wchar.h> +#include <cstring> +#include <sstream> + +#include "utils/text.h" + +using namespace std; + +// A non-ASCII string has 3 different lengths: +// - bytes +// - characters (non-ASCII ones have multiple bytes in UTF-8) +// - columns (Chinese characters are 2 columns wide) +// In #328918 see how confusing these leads to misalignment. + +// return the number of columns in str, or -1 if there's an error +static +int string_to_columns_e (const string & str) +{ + // from smpppd.src.rpm/format.cc, thanks arvin + + const char* ptr = str.c_str (); + size_t s_bytes = str.length (); + int s_cols = 0; + + mbstate_t shift_state; + memset (&shift_state, 0, sizeof (shift_state)); + + wchar_t wc; + size_t c_bytes; + + // mbrtowc produces one wide character from a multibyte string + while ((c_bytes = mbrtowc (&wc, ptr, s_bytes, &shift_state)) > 0) + { + if (c_bytes >= (size_t) -2) // incomplete (-2) or invalid (-1) sequence + return -1; + + s_cols += wcwidth (wc); + + s_bytes -= c_bytes; + ptr += c_bytes; + } + + return s_cols; +} + +unsigned string_to_columns (const string& str) +{ + int c = string_to_columns_e (str); + if (c < 0) + return str.length(); // fallback if there was an error + else + return (unsigned) c; +} + + +void wrap_text(ostream & out, const string & text, + unsigned indent, unsigned wrap_width, int initial) +{ + const char * s = text.c_str(); + size_t s_bytes = text.length (); + const char * prevwp = s; + const char * linep = s; + wchar_t wc; + size_t bytes_read; + bool in_word = false; + + mbstate_t shift_state; + memset (&shift_state, 0, sizeof (shift_state)); + + unsigned col = 0; + unsigned toindent = initial < 0 ? indent : initial; + //wchar_t ws[2] = L" "; + do + { + // indentation + if (!col) + { + out << string(toindent, ' '); + col = toindent; + } + + bytes_read = mbrtowc (&wc, s, s_bytes, &shift_state); + if (bytes_read > 0) + { + col += ::wcwidth(wc); + + if (::iswspace(wc)) + in_word = false; + //else if (::wcscmp(wc, L"\n")) + //{ + // if (!in_word) + // prevwp = s; + // in_word = true; + //} + else + { + if (!in_word) + prevwp = s; + in_word = true; + } + + // current wc exceeded the wrap width + if (col > wrap_width) + { + // update the size of the string to read + s_bytes -= (prevwp - linep); + // print the line, leave linep point to the start of the last word. + for (; linep < prevwp; ++linep) + out << *linep; + out << endl; + // reset column counter + col = 0; + toindent = indent; + // reset original text pointer (points to current wc, not the start of the word) + s = linep; + // reset shift state + ::memset (&shift_state, 0, sizeof (shift_state)); + } + else + s += bytes_read; + } + // we're at the end of the string + else if (bytes_read == 0) + { + // print the rest of the text + for(; *linep; ++linep) + out << *linep; + } + else + { + out << endl << "WCHAR ERROR" << endl; + return; + } + } + while(bytes_read > 0); +} diff --git a/src/utils/text.h b/src/utils/text.h new file mode 100644 index 0000000..010a15d --- /dev/null +++ b/src/utils/text.h @@ -0,0 +1,25 @@ +/*---------------------------------------------------------------------------*\ + ____ _ _ __ _ __ ___ _ _ + |_ / || | '_ \ '_ \/ -_) '_| + /__|\_, | .__/ .__/\___|_| + |__/|_| |_| +\*---------------------------------------------------------------------------*/ + +#ifndef ZYPPER_UTILS_TEXT_H_ +#define ZYPPER_UTILS_TEXT_H_ + +#include <string> +#include <iosfwd> + +/** Returns the length of the string in columns */ +/* + * TODO + * - delete whitespace at the end of lines + * - keep one-letter words with the next + */ +unsigned string_to_columns (const std::string & str); + +void wrap_text(std::ostream & out, const std::string & text, + unsigned indent, unsigned wrap_width, int initial = -1); + +#endif /* ZYPPER_UTILS_TEXT_H_ */ -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : Fix Patch::categoryEnum.
by Michael Andres 20 Mar '09

20 Mar '09

ref: refs/heads/master commit 1893b24481c817e0d9709d4674c505f342da252f Author: Michael Andres <ma(a)suse.de> Date: Fri Mar 20 17:42:59 2009 +0100 Fix Patch::categoryEnum. --- zypp/Patch.cc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/zypp/Patch.cc b/zypp/Patch.cc index cb35e75..bd5ed04 100644 --- a/zypp/Patch.cc +++ b/zypp/Patch.cc @@ -54,7 +54,8 @@ namespace zypp static const IdString cat_optional( "optional" ); static const IdString cat_document( "document" ); - IdString cat( sat::LookupAttr( sat::SolvAttr::patchcategory ).begin().idStr() ); + // patch category is not poolized in the solv file (i.e. an IdString) ;( + IdString cat( sat::LookupAttr( sat::SolvAttr::patchcategory, satSolvable() ).begin().c_str() ); if ( cat == cat_yast ) return CAT_YAST; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> SuSE-Code-11-Branch : changes
by Michael Andres 20 Mar '09

20 Mar '09

ref: refs/heads/SuSE-Code-11-Branch commit 87c4b82fe196c81f33df895e81890e317ce200dc Author: Michael Andres <ma(a)suse.de> Date: Fri Mar 20 17:43:12 2009 +0100 changes --- VERSION.cmake | 4 ++-- package/libzypp.changes | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 5b6d9a9..790bc9e 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -51,8 +51,8 @@ SET(LIBZYPP_MAJOR "5") SET(LIBZYPP_COMPATMINOR "23") SET(LIBZYPP_MINOR "29") -SET(LIBZYPP_PATCH "3") +SET(LIBZYPP_PATCH "4") # -# LAST RELEASED: 5.29.3 (23) +# LAST RELEASED: 5.29.4 (23) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/package/libzypp.changes b/package/libzypp.changes index e27701a..e4621f7 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Mar 20 17:42:08 CET 2009 - ma(a)suse.de + +- Fix Patch::categoryEnum. +- version 5.29.4 (23) + +------------------------------------------------------------------- Thu Mar 5 14:58:52 CET 2009 - ma(a)suse.de - Remove a lock if the locking process is in zombie state. (bnc #481577) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0