Changeset 5704
- Timestamp:
- 05/06/12 04:27:52 (3 weeks ago)
- Files:
-
- trunk/build/script/bob.rb (modified) (2 diffs)
- trunk/tango/text/Regex.d (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/build/script/bob.rb
r5612 r5704 573 573 arch = Arch.is64bit? ? "-m64" : "-m32" unless Arch.native? 574 574 @gcc = "gcc -c #{arch} -o #{@args.objs}/" 575 @gcc32 = "gcc -c -m32 -o #{@args.objs}/"575 # @gcc32 = "gcc -c -m32 -o #{@args.objs}/" 576 576 577 577 @dmd = dmd … … 602 602 if @args.core 603 603 scan(".c") do |file| 604 obj = compile(file, @gcc 32)604 obj = compile(file, @gcc) 605 605 addToLib(obj) 606 606 end 607 607 608 608 scan(".S") do |file| 609 obj = compile(file, @gcc 32)609 obj = compile(file, @gcc) 610 610 addToLib(obj) 611 611 end trunk/tango/text/Regex.d
r5673 r5704 3691 3691 pattern_ = pattern; 3692 3692 3693 debug(TangoRegex) {}3694 else { scope tnfa_t tnfa_; }3695 3693 static if ( is(char_t == dchar) ) { 3696 tnfa_ = new tnfa_t(pattern_); 3694 debug(TangoRegex) { 3695 tnfa_ = new tnfa_t(pattern_); 3696 } else { 3697 scope tnfa_t tnfa_ = new tnfa_t(pattern_); 3698 } 3697 3699 } 3698 3700 else { 3699 tnfa_ = new tnfa_t(tango.text.convert.Utf.toString32(pattern_)); 3701 debug(TangoRegex) { 3702 tnfa_ = new tnfa_t(tango.text.convert.Utf.toString32(pattern_)); 3703 } else { 3704 scope tnfa_t tnfa_ = new tnfa_t(tango.text.convert.Utf.toString32(pattern_)); 3705 } 3706 3700 3707 } 3701 3708 tnfa_.swapMatchingBracketSyntax = swapMBS;












