← Back to branch summary

~ubuntu-branches/ubuntu/quantal/ruby1.9.1/quantal

« back to all changes in this revision

Viewing changes to lib/irb/ruby-token.rb

  • Committer: Bazaar Package Importer
  • Author(s): Lucas Nussbaum
  • Date: 2010-07-31 17:08:39 UTC
  • mfrom: (1.1.4 upstream) (8.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20100731170839-j034dmpdqt1cc4p6
Tags: 1.9.2~svn28788-1
http://bugs.debian.org/580852
http://bugs.debian.org/590002
http://bugs.debian.org/543805
http://bugs.debian.org/542927
* New release based on upstream snapshot from the 1.9.2 branch,
  after 1.9.2 RC2. That branch is (supposed to be) binary-compatible
  with the 1.9.1 branch.
  + Builds fine on i386. Closes: #580852.
* Upgrade to Standards-Version: 3.9.1. No changes needed.
* Updated generated incs.
* Patches that still need work:
  + Unclear status, need more investigation:
   090729_fix_Makefile_deps.dpatch
   090803_exclude_rdoc.dpatch
   203_adjust_base_of_search_path.dpatch
   902_define_YAML_in_yaml_stringio.rb.dpatch
   919_common.mk_tweaks.dpatch
   931_libruby_suffix.dpatch
   940_test_thread_mutex_sync_shorter.dpatch
  + Maybe not needed anymore, keeping but not applying.
   102_skip_test_copy_stream.dpatch (test doesn't block anymore?)
   104_skip_btest_io.dpatch (test doesn't block anymore?)
   201_gem_prelude.dpatch (we don't use that rubygems anyway?)
   202_gem_default_dir.dpatch (we don't use that rubygems anyway?)
   940_test_file_exhaustive_fails_as_root.dpatch
   940_test_priority_fails.dpatch
   100518_load_libc_libm.dpatch
* Add disable-tests.diff: disable some tests that cause failures on FreeBSD.
  Closes: #590002, #543805, #542927.
* However, many new failures on FreeBSD. Since that version is still an
  improvement, add the check that makes test suite failures non-fatal on
  FreeBSD again. That still needs to be investigated.
* Re-add 903_skip_base_ruby_check.dpatch
* Add build-dependency on ruby1.8 and drop all pre-generated files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/irb/ruby-token.rb
1
1
#
2
 
#   irb/ruby-token.rb - ruby tokens 
3
 
#       $Release Version: 0.9.5$
4
 
#       $Revision: 14912 $
 
2
#   irb/ruby-token.rb - ruby tokens
 
3
#       $Release Version: 0.9.6$
 
4
#       $Revision: 25189 $
5
5
#       by Keiju ISHITSUKA(keiju@ruby-lang.org)
6
6
#
7
7
# --
8
8
#
9
 
#   
 
9
#
10
10
#
11
11
module RubyToken
12
12
  EXPR_BEG = :EXPR_BEG
21
21
  if !defined?(Symbol)
22
22
    Symbol = Integer
23
23
  end
24
 
  
 
24
 
25
25
  class Token
26
26
    def initialize(seek, line_no, char_no)
27
27
      @seek = seek
84
84
      if (tk = TkReading2Token[token]).nil?
85
85
        IRB.fail TkReading2TokenNoKey, token
86
86
      end
87
 
      tk = Token(tk[0], value) 
 
87
      tk = Token(tk[0], value)
88
88
      if tk.kind_of?(TkOp)
89
89
        tk.name = token
90
90
      end
93
93
      if (tk = TkSymbol2Token[token]).nil?
94
94
        IRB.fail TkSymbol2TokenNoKey, token
95
95
      end
96
 
      return Token(tk[0], value) 
97
 
    else 
 
96
      return Token(tk[0], value)
 
97
    else
98
98
      if (token.ancestors & [TkId, TkVal, TkOPASGN, TkUnknownChar]).empty?
99
99
        token.new(@prev_seek, @prev_line_no, @prev_char_no)
100
100
      else
194
194
    [:TkASSOC,      TkOp,   "=>"],
195
195
    [:TkQUESTION,   TkOp,   "?"],        #?
196
196
    [:TkCOLON,      TkOp,   ":"],        #:
197
 
    
 
197
 
198
198
    [:TkfLPAREN],         # func( #
199
199
    [:TkfLBRACK],         # func[ #
200
200
    [:TkfLBRACE],         # func{ #
250
250
      IRB.fail AlreadyDefinedToken, token_n
251
251
    end
252
252
    token_c = eval("class #{token_n} < #{super_token}; end; #{token_n}")
253
 
    
 
253
 
254
254
    if reading
255
255
      if TkReading2Token[reading]
256
256
        IRB.fail TkReading2TokenDuplicateError, token_n, reading