← Back to branch summary

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

« back to all changes in this revision

Viewing changes to lib/rdoc/tokenstream.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/rdoc/tokenstream.rb
9
9
 
10
10
module RDoc::TokenStream
11
11
 
12
 
  def token_stream
13
 
    @token_stream
 
12
  ##
 
13
  # Adds +tokens+ to the collected tokens
 
14
 
 
15
  def add_tokens(*tokens)
 
16
    tokens.flatten.each { |token| @token_stream << token }
14
17
  end
15
18
 
16
 
  def start_collecting_tokens
 
19
  alias add_token add_tokens
 
20
 
 
21
  ##
 
22
  # Starts collecting tokens
 
23
 
 
24
  def collect_tokens
17
25
    @token_stream = []
18
26
  end
19
27
 
20
 
  def add_token(tk)
21
 
    @token_stream << tk
22
 
  end
 
28
  alias start_collecting_tokens collect_tokens
23
29
 
24
 
  def add_tokens(tks)
25
 
    tks.each  {|tk| add_token(tk)}
26
 
  end
 
30
  ##
 
31
  # Remove the last token from the collected tokens
27
32
 
28
33
  def pop_token
29
34
    @token_stream.pop
30
35
  end
31
36
 
 
37
  ##
 
38
  # Current token stream
 
39
 
 
40
  def token_stream
 
41
    @token_stream
 
42
  end
 
43
 
 
44
  ##
 
45
  # Returns a string representation of the token stream
 
46
 
 
47
  def tokens_to_s
 
48
    token_stream.map { |token| token.text }.join ''
 
49
  end
 
50
 
32
51
end
33
52