pygments.rb 0.2.4 → 0.2.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (120) hide show
  1. data/lib/pygments/version.rb +1 -1
  2. data/vendor/pygments-main/AUTHORS +14 -0
  3. data/vendor/pygments-main/CHANGES +34 -3
  4. data/vendor/pygments-main/Makefile +1 -1
  5. data/vendor/pygments-main/docs/generate.py +1 -1
  6. data/vendor/pygments-main/external/markdown-processor.py +1 -1
  7. data/vendor/pygments-main/external/moin-parser.py +1 -1
  8. data/vendor/pygments-main/external/rst-directive-old.py +1 -1
  9. data/vendor/pygments-main/external/rst-directive.py +1 -1
  10. data/vendor/pygments-main/pygments/__init__.py +1 -1
  11. data/vendor/pygments-main/pygments/cmdline.py +4 -1
  12. data/vendor/pygments-main/pygments/console.py +1 -1
  13. data/vendor/pygments-main/pygments/filter.py +1 -1
  14. data/vendor/pygments-main/pygments/filters/__init__.py +1 -1
  15. data/vendor/pygments-main/pygments/formatter.py +1 -1
  16. data/vendor/pygments-main/pygments/formatters/__init__.py +1 -1
  17. data/vendor/pygments-main/pygments/formatters/_mapping.py +1 -1
  18. data/vendor/pygments-main/pygments/formatters/bbcode.py +1 -1
  19. data/vendor/pygments-main/pygments/formatters/html.py +2 -2
  20. data/vendor/pygments-main/pygments/formatters/img.py +1 -1
  21. data/vendor/pygments-main/pygments/formatters/latex.py +3 -2
  22. data/vendor/pygments-main/pygments/formatters/other.py +1 -1
  23. data/vendor/pygments-main/pygments/formatters/rtf.py +1 -1
  24. data/vendor/pygments-main/pygments/formatters/svg.py +1 -1
  25. data/vendor/pygments-main/pygments/formatters/terminal.py +5 -2
  26. data/vendor/pygments-main/pygments/formatters/terminal256.py +5 -2
  27. data/vendor/pygments-main/pygments/lexer.py +29 -10
  28. data/vendor/pygments-main/pygments/lexers/__init__.py +14 -11
  29. data/vendor/pygments-main/pygments/lexers/_asybuiltins.py +1 -1
  30. data/vendor/pygments-main/pygments/lexers/_clbuiltins.py +1 -1
  31. data/vendor/pygments-main/pygments/lexers/_luabuiltins.py +1 -1
  32. data/vendor/pygments-main/pygments/lexers/_mapping.py +41 -23
  33. data/vendor/pygments-main/pygments/lexers/_phpbuiltins.py +1 -1
  34. data/vendor/pygments-main/pygments/lexers/_postgres_builtins.py +1 -1
  35. data/vendor/pygments-main/pygments/lexers/_scilab_builtins.py +29 -0
  36. data/vendor/pygments-main/pygments/lexers/_vimbuiltins.py +3 -3
  37. data/vendor/pygments-main/pygments/lexers/agile.py +148 -443
  38. data/vendor/pygments-main/pygments/lexers/asm.py +5 -3
  39. data/vendor/pygments-main/pygments/lexers/compiled.py +298 -294
  40. data/vendor/pygments-main/pygments/lexers/dotnet.py +40 -34
  41. data/vendor/pygments-main/pygments/lexers/functional.py +723 -4
  42. data/vendor/pygments-main/pygments/lexers/hdl.py +228 -6
  43. data/vendor/pygments-main/pygments/lexers/jvm.py +678 -0
  44. data/vendor/pygments-main/pygments/lexers/math.py +65 -2
  45. data/vendor/pygments-main/pygments/lexers/other.py +875 -481
  46. data/vendor/pygments-main/pygments/lexers/parsers.py +1 -1
  47. data/vendor/pygments-main/pygments/lexers/shell.py +360 -0
  48. data/vendor/pygments-main/pygments/lexers/special.py +1 -1
  49. data/vendor/pygments-main/pygments/lexers/sql.py +565 -0
  50. data/vendor/pygments-main/pygments/lexers/templates.py +1 -1
  51. data/vendor/pygments-main/pygments/lexers/text.py +237 -100
  52. data/vendor/pygments-main/pygments/lexers/web.py +146 -10
  53. data/vendor/pygments-main/pygments/plugin.py +1 -1
  54. data/vendor/pygments-main/pygments/scanner.py +1 -1
  55. data/vendor/pygments-main/pygments/style.py +1 -1
  56. data/vendor/pygments-main/pygments/styles/__init__.py +2 -1
  57. data/vendor/pygments-main/pygments/styles/autumn.py +1 -1
  58. data/vendor/pygments-main/pygments/styles/borland.py +1 -1
  59. data/vendor/pygments-main/pygments/styles/bw.py +1 -1
  60. data/vendor/pygments-main/pygments/styles/colorful.py +1 -1
  61. data/vendor/pygments-main/pygments/styles/default.py +1 -1
  62. data/vendor/pygments-main/pygments/styles/emacs.py +1 -1
  63. data/vendor/pygments-main/pygments/styles/friendly.py +1 -1
  64. data/vendor/pygments-main/pygments/styles/fruity.py +1 -2
  65. data/vendor/pygments-main/pygments/styles/manni.py +1 -1
  66. data/vendor/pygments-main/pygments/styles/monokai.py +1 -1
  67. data/vendor/pygments-main/pygments/styles/murphy.py +1 -1
  68. data/vendor/pygments-main/pygments/styles/native.py +1 -1
  69. data/vendor/pygments-main/pygments/styles/pastie.py +1 -1
  70. data/vendor/pygments-main/pygments/styles/perldoc.py +1 -1
  71. data/vendor/pygments-main/pygments/styles/rrt.py +33 -0
  72. data/vendor/pygments-main/pygments/styles/tango.py +1 -1
  73. data/vendor/pygments-main/pygments/styles/trac.py +1 -1
  74. data/vendor/pygments-main/pygments/styles/vim.py +1 -1
  75. data/vendor/pygments-main/pygments/styles/vs.py +1 -1
  76. data/vendor/pygments-main/pygments/token.py +1 -1
  77. data/vendor/pygments-main/pygments/unistring.py +1 -1
  78. data/vendor/pygments-main/pygments/util.py +2 -2
  79. data/vendor/pygments-main/scripts/check_sources.py +2 -2
  80. data/vendor/pygments-main/scripts/find_codetags.py +1 -1
  81. data/vendor/pygments-main/scripts/find_error.py +5 -2
  82. data/vendor/pygments-main/scripts/get_vimkw.py +9 -4
  83. data/vendor/pygments-main/setup.py +1 -1
  84. data/vendor/pygments-main/tests/examplefiles/classes.dylan +16 -0
  85. data/vendor/pygments-main/tests/examplefiles/coq_RelationClasses +447 -0
  86. data/vendor/pygments-main/tests/examplefiles/example.cls +15 -0
  87. data/vendor/pygments-main/tests/examplefiles/example.moon +629 -0
  88. data/vendor/pygments-main/tests/examplefiles/example.p +34 -0
  89. data/vendor/pygments-main/tests/examplefiles/example.snobol +15 -0
  90. data/vendor/pygments-main/tests/examplefiles/example.u +548 -0
  91. data/vendor/pygments-main/tests/examplefiles/example_elixir.ex +363 -0
  92. data/vendor/pygments-main/tests/examplefiles/foo.sce +6 -0
  93. data/vendor/pygments-main/tests/examplefiles/http_request_example +14 -0
  94. data/vendor/pygments-main/tests/examplefiles/http_response_example +27 -0
  95. data/vendor/pygments-main/tests/examplefiles/irc.lsp +214 -0
  96. data/vendor/pygments-main/tests/examplefiles/markdown.lsp +679 -0
  97. data/vendor/pygments-main/tests/examplefiles/nemerle_sample.n +4 -2
  98. data/vendor/pygments-main/tests/examplefiles/reversi.lsp +427 -0
  99. data/vendor/pygments-main/tests/examplefiles/scilab.sci +30 -0
  100. data/vendor/pygments-main/tests/examplefiles/test.bro +250 -0
  101. data/vendor/pygments-main/tests/examplefiles/test.cs +23 -0
  102. data/vendor/pygments-main/tests/examplefiles/test.dart +23 -0
  103. data/vendor/pygments-main/tests/examplefiles/test.ecl +58 -0
  104. data/vendor/pygments-main/tests/examplefiles/test.fan +818 -0
  105. data/vendor/pygments-main/tests/examplefiles/test.ps1 +108 -0
  106. data/vendor/pygments-main/tests/examplefiles/test.vhdl +161 -0
  107. data/vendor/pygments-main/tests/old_run.py +1 -1
  108. data/vendor/pygments-main/tests/run.py +1 -1
  109. data/vendor/pygments-main/tests/test_basic_api.py +4 -3
  110. data/vendor/pygments-main/tests/test_clexer.py +1 -1
  111. data/vendor/pygments-main/tests/test_cmdline.py +1 -1
  112. data/vendor/pygments-main/tests/test_examplefiles.py +4 -3
  113. data/vendor/pygments-main/tests/test_html_formatter.py +33 -1
  114. data/vendor/pygments-main/tests/test_latex_formatter.py +1 -1
  115. data/vendor/pygments-main/tests/test_perllexer.py +137 -0
  116. data/vendor/pygments-main/tests/test_regexlexer.py +1 -1
  117. data/vendor/pygments-main/tests/test_token.py +1 -1
  118. data/vendor/pygments-main/tests/test_using_api.py +1 -1
  119. data/vendor/pygments-main/tests/test_util.py +35 -5
  120. metadata +30 -4
@@ -32,7 +32,7 @@
32
32
  yourfilter = yourfilter:YourFilter
33
33
 
34
34
 
35
- :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
35
+ :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
36
36
  :license: BSD, see LICENSE for details.
37
37
  """
38
38
  try:
@@ -12,7 +12,7 @@
12
12
  Have a look at the `DelphiLexer` to get an idea of how to use
13
13
  this scanner.
14
14
 
15
- :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
15
+ :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
16
16
  :license: BSD, see LICENSE for details.
17
17
  """
18
18
  import re
@@ -5,7 +5,7 @@
5
5
 
6
6
  Basic style object.
7
7
 
8
- :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
8
+ :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
9
9
  :license: BSD, see LICENSE for details.
10
10
  """
11
11
 
@@ -5,7 +5,7 @@
5
5
 
6
6
  Contains built-in styles.
7
7
 
8
- :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
8
+ :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
9
9
  :license: BSD, see LICENSE for details.
10
10
  """
11
11
 
@@ -33,6 +33,7 @@ STYLE_MAP = {
33
33
  'vim': 'vim::VimStyle',
34
34
  'vs': 'vs::VisualStudioStyle',
35
35
  'tango': 'tango::TangoStyle',
36
+ 'rrt': 'rrt::RrtStyle',
36
37
  }
37
38
 
38
39
 
@@ -5,7 +5,7 @@
5
5
 
6
6
  A colorful style, inspired by the terminal highlighting style.
7
7
 
8
- :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
8
+ :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
9
9
  :license: BSD, see LICENSE for details.
10
10
  """
11
11
 
@@ -5,7 +5,7 @@
5
5
 
6
6
  Style similar to the style used in the Borland IDEs.
7
7
 
8
- :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
8
+ :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
9
9
  :license: BSD, see LICENSE for details.
10
10
  """
11
11
 
@@ -5,7 +5,7 @@
5
5
 
6
6
  Simple black/white only style.
7
7
 
8
- :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
8
+ :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
9
9
  :license: BSD, see LICENSE for details.
10
10
  """
11
11
 
@@ -5,7 +5,7 @@
5
5
 
6
6
  A colorful style, inspired by CodeRay.
7
7
 
8
- :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
8
+ :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
9
9
  :license: BSD, see LICENSE for details.
10
10
  """
11
11
 
@@ -5,7 +5,7 @@
5
5
 
6
6
  The default highlighting style.
7
7
 
8
- :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
8
+ :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
9
9
  :license: BSD, see LICENSE for details.
10
10
  """
11
11
 
@@ -5,7 +5,7 @@
5
5
 
6
6
  A highlighting style for Pygments, inspired by Emacs.
7
7
 
8
- :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
8
+ :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
9
9
  :license: BSD, see LICENSE for details.
10
10
  """
11
11
 
@@ -5,7 +5,7 @@
5
5
 
6
6
  A modern style based on the VIM pyte theme.
7
7
 
8
- :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
8
+ :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
9
9
  :license: BSD, see LICENSE for details.
10
10
  """
11
11
 
@@ -5,7 +5,7 @@
5
5
 
6
6
  pygments version of my "fruity" vim theme.
7
7
 
8
- :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
8
+ :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
9
9
  :license: BSD, see LICENSE for details.
10
10
  """
11
11
 
@@ -30,7 +30,6 @@ class FruityStyle(Style):
30
30
  Number: '#0086f7 bold',
31
31
  Name.Tag: '#fb660a bold',
32
32
  Name.Variable: '#fb660a',
33
- Name.Constant: '#fb660a',
34
33
  Comment: '#008800 bg:#0f140f italic',
35
34
  Name.Attribute: '#ff0086 bold',
36
35
  String: '#0086d2',
@@ -8,7 +8,7 @@
8
8
  This is a port of the style used in the `php port`_ of pygments
9
9
  by Manni. The style is called 'default' there.
10
10
 
11
- :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
11
+ :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
12
12
  :license: BSD, see LICENSE for details.
13
13
  """
14
14
 
@@ -7,7 +7,7 @@
7
7
 
8
8
  http://www.monokai.nl/blog/2006/07/15/textmate-color-theme/
9
9
 
10
- :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
10
+ :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
11
11
  :license: BSD, see LICENSE for details.
12
12
  """
13
13
 
@@ -5,7 +5,7 @@
5
5
 
6
6
  Murphy's style from CodeRay.
7
7
 
8
- :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
8
+ :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
9
9
  :license: BSD, see LICENSE for details.
10
10
  """
11
11
 
@@ -5,7 +5,7 @@
5
5
 
6
6
  pygments version of my "native" vim theme.
7
7
 
8
- :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
8
+ :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
9
9
  :license: BSD, see LICENSE for details.
10
10
  """
11
11
 
@@ -7,7 +7,7 @@
7
7
 
8
8
  .. _pastie: http://pastie.caboo.se/
9
9
 
10
- :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
10
+ :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
11
11
  :license: BSD, see LICENSE for details.
12
12
  """
13
13
 
@@ -7,7 +7,7 @@
7
7
 
8
8
  .. _perldoc: http://perldoc.perl.org/
9
9
 
10
- :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
10
+ :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
11
11
  :license: BSD, see LICENSE for details.
12
12
  """
13
13
 
@@ -0,0 +1,33 @@
1
+ # -*- coding: utf-8 -*-
2
+ """
3
+ pygments.styles.rrt
4
+ ~~~~~~~~~~~~~~~~~~~
5
+
6
+ pygments "rrt" theme, based on Zap and Emacs defaults.
7
+
8
+ :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
9
+ :license: BSD, see LICENSE for details.
10
+ """
11
+
12
+ from pygments.style import Style
13
+ from pygments.token import Comment, Name, Keyword, String
14
+
15
+
16
+ class RrtStyle(Style):
17
+ """
18
+ Minimalistic "rrt" theme, based on Zap and Emacs defaults.
19
+ """
20
+
21
+ background_color = '#000000'
22
+ highlight_color = '#0000ff'
23
+
24
+ styles = {
25
+ Comment: '#00ff00',
26
+ Name.Function: '#ffff00',
27
+ Name.Variable: '#eedd82',
28
+ Name.Constant: '#7fffd4',
29
+ Keyword: '#ff0000',
30
+ Comment.Preproc: '#e5e5e5',
31
+ String: '#87ceeb',
32
+ Keyword.Type: '#ee82ee',
33
+ }
@@ -33,7 +33,7 @@
33
33
  have been chosen to have the same style. Similarly, keywords (Keyword.*),
34
34
  and Operator.Word (and, or, in) have been assigned the same style.
35
35
 
36
- :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
36
+ :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
37
37
  :license: BSD, see LICENSE for details.
38
38
  """
39
39
 
@@ -5,7 +5,7 @@
5
5
 
6
6
  Port of the default trac highlighter design.
7
7
 
8
- :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
8
+ :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
9
9
  :license: BSD, see LICENSE for details.
10
10
  """
11
11
 
@@ -5,7 +5,7 @@
5
5
 
6
6
  A highlighting style for Pygments, inspired by vim.
7
7
 
8
- :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
8
+ :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
9
9
  :license: BSD, see LICENSE for details.
10
10
  """
11
11
 
@@ -5,7 +5,7 @@
5
5
 
6
6
  Simple style with MS Visual Studio colors.
7
7
 
8
- :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
8
+ :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
9
9
  :license: BSD, see LICENSE for details.
10
10
  """
11
11
 
@@ -5,7 +5,7 @@
5
5
 
6
6
  Basic token types and the standard tokens.
7
7
 
8
- :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
8
+ :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
9
9
  :license: BSD, see LICENSE for details.
10
10
  """
11
11
 
@@ -8,7 +8,7 @@
8
8
 
9
9
  Inspired by chartypes_create.py from the MoinMoin project.
10
10
 
11
- :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
11
+ :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
12
12
  :license: BSD, see LICENSE for details.
13
13
  """
14
14
  from pygments.util import u_prefix
@@ -5,7 +5,7 @@
5
5
 
6
6
  Utility functions.
7
7
 
8
- :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
8
+ :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
9
9
  :license: BSD, see LICENSE for details.
10
10
  """
11
11
 
@@ -118,7 +118,7 @@ def make_analysator(f):
118
118
  return 0.0
119
119
  try:
120
120
  return min(1.0, max(0.0, float(rv)))
121
- except ValueError:
121
+ except (ValueError, TypeError):
122
122
  return 0.0
123
123
  text_analyse.__doc__ = f.__doc__
124
124
  return staticmethod(text_analyse)
@@ -7,7 +7,7 @@
7
7
  Make sure each Python file has a correct file header
8
8
  including copyright and license information.
9
9
 
10
- :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
10
+ :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
11
11
  :license: BSD, see LICENSE for details.
12
12
  """
13
13
 
@@ -30,7 +30,7 @@ def checker(*suffixes, **kwds):
30
30
 
31
31
 
32
32
  name_mail_re = r'[\w ]+(<.*?>)?'
33
- copyright_re = re.compile(r'^ :copyright: Copyright (?:\d{4}-)?2010 by '
33
+ copyright_re = re.compile(r'^ :copyright: Copyright 2006-2012 by '
34
34
  r'the Pygments team, see AUTHORS\.$', re.UNICODE)
35
35
  copyright_2_re = re.compile(r'^ %s(, %s)*[,.]$' %
36
36
  (name_mail_re, name_mail_re), re.UNICODE)
@@ -7,7 +7,7 @@
7
7
  Find code tags in specified files and/or directories
8
8
  and create a report in HTML format.
9
9
 
10
- :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
10
+ :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
11
11
  :license: BSD, see LICENSE for details.
12
12
  """
13
13
 
@@ -8,7 +8,7 @@
8
8
  the text where Error tokens are being generated, along
9
9
  with some context.
10
10
 
11
- :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
11
+ :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
12
12
  :license: BSD, see LICENSE for details.
13
13
  """
14
14
 
@@ -101,6 +101,9 @@ def main(fn, lexer=None, options={}):
101
101
  if lx.__class__.__bases__ == (RegexLexer,):
102
102
  lx.__class__.__bases__ = (DebuggingRegexLexer,)
103
103
  debug_lexer = True
104
+ elif lx.__class__.__bases__ == (DebuggingRegexLexer,):
105
+ # already debugged before
106
+ debug_lexer = True
104
107
  lno = 1
105
108
  text = file(fn, 'U').read()
106
109
  text = text.strip('\n') + '\n'
@@ -123,7 +126,7 @@ def main(fn, lexer=None, options={}):
123
126
  for tok, state in map(None, tokens, states):
124
127
  show_token(tok, state)
125
128
  else:
126
- for i in range(len(tokens) - num, len(tokens)):
129
+ for i in range(max(len(tokens) - num, 0), len(tokens)):
127
130
  show_token(tokens[i], states[i])
128
131
  print 'Error token:'
129
132
  l = len(repr(val))
@@ -22,11 +22,16 @@ def getkw(input, output):
22
22
 
23
23
  # Extract all the shortened versions
24
24
  for i in r_item.finditer(m.group(2)):
25
- d.append((i.group(1), "%s%s" % (i.group(1), i.group(2) or '')))
26
- d.sort()
25
+ d.append('(%r,%r)' %
26
+ (i.group(1), "%s%s" % (i.group(1), i.group(2) or '')))
27
+
28
+ output_info['option'].append("('nnoremap','nnoremap')")
29
+ output_info['option'].append("('inoremap','inoremap')")
30
+ output_info['option'].append("('vnoremap','vnoremap')")
27
31
 
28
32
  for a, b in output_info.items():
29
- print >>out, '%s=%r' % (a, b)
33
+ b.sort()
34
+ print >>out, '%s=[%s]' % (a, ','.join(b))
30
35
 
31
36
  def is_keyword(w, keywords):
32
37
  for i in range(len(w), 0, -1):
@@ -35,4 +40,4 @@ def is_keyword(w, keywords):
35
40
  return False
36
41
 
37
42
  if __name__ == "__main__":
38
- getkw("/usr/share/vim/vim70/syntax/vim.vim", "temp.py")
43
+ getkw("/usr/share/vim/vim73/syntax/vim.vim", "temp.py")
@@ -23,7 +23,7 @@
23
23
  .. _Pygments tip:
24
24
  http://bitbucket.org/birkenfeld/pygments-main/get/tip.zip#egg=Pygments-dev
25
25
 
26
- :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
26
+ :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
27
27
  :license: BSD, see LICENSE for details.
28
28
  """
29
29
 
@@ -22,3 +22,19 @@ end function;
22
22
  define constant $blue-car = make(<car>, model: "Viper");
23
23
  define constant $black-car = make(<car>, model: "Town Car", sunroof?: #t);
24
24
  define constant $red-car = make(<car>, model: "F40", sunroof?: #f);
25
+
26
+ define method foo() => _ :: <boolean>
27
+ #t
28
+ end method;
29
+
30
+ define method foo() => _ :: <boolean>;
31
+ #t
32
+ end method;
33
+
34
+ define method \+()
35
+ end;
36
+
37
+ define constant $symbol = #"hello";
38
+ define variable *vector* = #[3.5, 5]
39
+ define constant $list = #(1, 2);
40
+ define constant $pair = #(1 . "foo")
@@ -0,0 +1,447 @@
1
+ (* -*- coding: utf-8 -*- *)
2
+ (************************************************************************)
3
+ (* v * The Coq Proof Assistant / The Coq Development Team *)
4
+ (* <O___,, * INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2011 *)
5
+ (* \VV/ **************************************************************)
6
+ (* // * This file is distributed under the terms of the *)
7
+ (* * GNU Lesser General Public License Version 2.1 *)
8
+ (************************************************************************)
9
+
10
+ (** * Typeclass-based relations, tactics and standard instances
11
+
12
+ This is the basic theory needed to formalize morphisms and setoids.
13
+
14
+ Author: Matthieu Sozeau
15
+ Institution: LRI, CNRS UMR 8623 - University Paris Sud
16
+ *)
17
+
18
+ (* $Id: RelationClasses.v 14641 2011-11-06 11:59:10Z herbelin $ *)
19
+
20
+ Require Export Coq.Classes.Init.
21
+ Require Import Coq.Program.Basics.
22
+ Require Import Coq.Program.Tactics.
23
+ Require Import Coq.Relations.Relation_Definitions.
24
+
25
+ (** We allow to unfold the [relation] definition while doing morphism search. *)
26
+
27
+ Notation inverse R := (flip (R:relation _) : relation _).
28
+
29
+ Definition complement {A} (R : relation A) : relation A := fun x y => R x y -> False.
30
+
31
+ (** Opaque for proof-search. *)
32
+ Typeclasses Opaque complement.
33
+
34
+ (** These are convertible. *)
35
+
36
+ Lemma complement_inverse : forall A (R : relation A), complement (inverse R) = inverse (complement R).
37
+ Proof. reflexivity. Qed.
38
+
39
+ (** We rebind relations in separate classes to be able to overload each proof. *)
40
+
41
+ Set Implicit Arguments.
42
+ Unset Strict Implicit.
43
+
44
+ Class Reflexive {A} (R : relation A) :=
45
+ reflexivity : forall x, R x x.
46
+
47
+ Class Irreflexive {A} (R : relation A) :=
48
+ irreflexivity : Reflexive (complement R).
49
+
50
+ Hint Extern 1 (Reflexive (complement _)) => class_apply @irreflexivity : typeclass_instances.
51
+
52
+ Class Symmetric {A} (R : relation A) :=
53
+ symmetry : forall x y, R x y -> R y x.
54
+
55
+ Class Asymmetric {A} (R : relation A) :=
56
+ asymmetry : forall x y, R x y -> R y x -> False.
57
+
58
+ Class Transitive {A} (R : relation A) :=
59
+ transitivity : forall x y z, R x y -> R y z -> R x z.
60
+
61
+ Hint Resolve @irreflexivity : ord.
62
+
63
+ Unset Implicit Arguments.
64
+
65
+ (** A HintDb for relations. *)
66
+
67
+ Ltac solve_relation :=
68
+ match goal with
69
+ | [ |- ?R ?x ?x ] => reflexivity
70
+ | [ H : ?R ?x ?y |- ?R ?y ?x ] => symmetry ; exact H
71
+ end.
72
+
73
+ Hint Extern 4 => solve_relation : relations.
74
+
75
+ (** We can already dualize all these properties. *)
76
+
77
+ Generalizable Variables A B C D R S T U l eqA eqB eqC eqD.
78
+
79
+ Lemma flip_Reflexive `{Reflexive A R} : Reflexive (flip R).
80
+ Proof. tauto. Qed.
81
+
82
+ Hint Extern 3 (Reflexive (flip _)) => apply flip_Reflexive : typeclass_instances.
83
+
84
+ Program Definition flip_Irreflexive `(Irreflexive A R) : Irreflexive (flip R) :=
85
+ irreflexivity (R:=R).
86
+
87
+ Program Definition flip_Symmetric `(Symmetric A R) : Symmetric (flip R) :=
88
+ fun x y H => symmetry (R:=R) H.
89
+
90
+ Program Definition flip_Asymmetric `(Asymmetric A R) : Asymmetric (flip R) :=
91
+ fun x y H H' => asymmetry (R:=R) H H'.
92
+
93
+ Program Definition flip_Transitive `(Transitive A R) : Transitive (flip R) :=
94
+ fun x y z H H' => transitivity (R:=R) H' H.
95
+
96
+ Hint Extern 3 (Irreflexive (flip _)) => class_apply flip_Irreflexive : typeclass_instances.
97
+ Hint Extern 3 (Symmetric (flip _)) => class_apply flip_Symmetric : typeclass_instances.
98
+ Hint Extern 3 (Asymmetric (flip _)) => class_apply flip_Asymmetric : typeclass_instances.
99
+ Hint Extern 3 (Transitive (flip _)) => class_apply flip_Transitive : typeclass_instances.
100
+
101
+ Definition Reflexive_complement_Irreflexive `(Reflexive A (R : relation A))
102
+ : Irreflexive (complement R).
103
+ Proof. firstorder. Qed.
104
+
105
+ Definition complement_Symmetric `(Symmetric A (R : relation A)) : Symmetric (complement R).
106
+ Proof. firstorder. Qed.
107
+
108
+ Hint Extern 3 (Symmetric (complement _)) => class_apply complement_Symmetric : typeclass_instances.
109
+ Hint Extern 3 (Irreflexive (complement _)) => class_apply Reflexive_complement_Irreflexive : typeclass_instances.
110
+
111
+ (** * Standard instances. *)
112
+
113
+ Ltac reduce_hyp H :=
114
+ match type of H with
115
+ | context [ _ <-> _ ] => fail 1
116
+ | _ => red in H ; try reduce_hyp H
117
+ end.
118
+
119
+ Ltac reduce_goal :=
120
+ match goal with
121
+ | [ |- _ <-> _ ] => fail 1
122
+ | _ => red ; intros ; try reduce_goal
123
+ end.
124
+
125
+ Tactic Notation "reduce" "in" hyp(Hid) := reduce_hyp Hid.
126
+
127
+ Ltac reduce := reduce_goal.
128
+
129
+ Tactic Notation "apply" "*" constr(t) :=
130
+ first [ refine t | refine (t _) | refine (t _ _) | refine (t _ _ _) | refine (t _ _ _ _) |
131
+ refine (t _ _ _ _ _) | refine (t _ _ _ _ _ _) | refine (t _ _ _ _ _ _ _) ].
132
+
133
+ Ltac simpl_relation :=
134
+ unfold flip, impl, arrow ; try reduce ; program_simpl ;
135
+ try ( solve [ intuition ]).
136
+
137
+ Local Obligation Tactic := simpl_relation.
138
+
139
+ (** Logical implication. *)
140
+
141
+ Program Instance impl_Reflexive : Reflexive impl.
142
+ Program Instance impl_Transitive : Transitive impl.
143
+
144
+ (** Logical equivalence. *)
145
+
146
+ Program Instance iff_Reflexive : Reflexive iff.
147
+ Program Instance iff_Symmetric : Symmetric iff.
148
+ Program Instance iff_Transitive : Transitive iff.
149
+
150
+ (** Leibniz equality. *)
151
+
152
+ Instance eq_Reflexive {A} : Reflexive (@eq A) := @eq_refl A.
153
+ Instance eq_Symmetric {A} : Symmetric (@eq A) := @eq_sym A.
154
+ Instance eq_Transitive {A} : Transitive (@eq A) := @eq_trans A.
155
+
156
+ (** Various combinations of reflexivity, symmetry and transitivity. *)
157
+
158
+ (** A [PreOrder] is both Reflexive and Transitive. *)
159
+
160
+ Class PreOrder {A} (R : relation A) : Prop := {
161
+ PreOrder_Reflexive :> Reflexive R ;
162
+ PreOrder_Transitive :> Transitive R }.
163
+
164
+ (** A partial equivalence relation is Symmetric and Transitive. *)
165
+
166
+ Class PER {A} (R : relation A) : Prop := {
167
+ PER_Symmetric :> Symmetric R ;
168
+ PER_Transitive :> Transitive R }.
169
+
170
+ (** Equivalence relations. *)
171
+
172
+ Class Equivalence {A} (R : relation A) : Prop := {
173
+ Equivalence_Reflexive :> Reflexive R ;
174
+ Equivalence_Symmetric :> Symmetric R ;
175
+ Equivalence_Transitive :> Transitive R }.
176
+
177
+ (** An Equivalence is a PER plus reflexivity. *)
178
+
179
+ Instance Equivalence_PER `(Equivalence A R) : PER R | 10 :=
180
+ { PER_Symmetric := Equivalence_Symmetric ;
181
+ PER_Transitive := Equivalence_Transitive }.
182
+
183
+ (** We can now define antisymmetry w.r.t. an equivalence relation on the carrier. *)
184
+
185
+ Class Antisymmetric A eqA `{equ : Equivalence A eqA} (R : relation A) :=
186
+ antisymmetry : forall {x y}, R x y -> R y x -> eqA x y.
187
+
188
+ Program Definition flip_antiSymmetric `(Antisymmetric A eqA R) :
189
+ Antisymmetric A eqA (flip R).
190
+ Proof. firstorder. Qed.
191
+
192
+ (** Leibinz equality [eq] is an equivalence relation.
193
+ The instance has low priority as it is always applicable
194
+ if only the type is constrained. *)
195
+
196
+ Program Instance eq_equivalence : Equivalence (@eq A) | 10.
197
+
198
+ (** Logical equivalence [iff] is an equivalence relation. *)
199
+
200
+ Program Instance iff_equivalence : Equivalence iff.
201
+
202
+ (** We now develop a generalization of results on relations for arbitrary predicates.
203
+ The resulting theory can be applied to homogeneous binary relations but also to
204
+ arbitrary n-ary predicates. *)
205
+
206
+ Local Open Scope list_scope.
207
+
208
+ (* Notation " [ ] " := nil : list_scope. *)
209
+ (* Notation " [ x ; .. ; y ] " := (cons x .. (cons y nil) ..) (at level 1) : list_scope. *)
210
+
211
+ (** A compact representation of non-dependent arities, with the codomain singled-out. *)
212
+
213
+ Fixpoint arrows (l : list Type) (r : Type) : Type :=
214
+ match l with
215
+ | nil => r
216
+ | A :: l' => A -> arrows l' r
217
+ end.
218
+
219
+ (** We can define abbreviations for operation and relation types based on [arrows]. *)
220
+
221
+ Definition unary_operation A := arrows (A::nil) A.
222
+ Definition binary_operation A := arrows (A::A::nil) A.
223
+ Definition ternary_operation A := arrows (A::A::A::nil) A.
224
+
225
+ (** We define n-ary [predicate]s as functions into [Prop]. *)
226
+
227
+ Notation predicate l := (arrows l Prop).
228
+
229
+ (** Unary predicates, or sets. *)
230
+
231
+ Definition unary_predicate A := predicate (A::nil).
232
+
233
+ (** Homogeneous binary relations, equivalent to [relation A]. *)
234
+
235
+ Definition binary_relation A := predicate (A::A::nil).
236
+
237
+ (** We can close a predicate by universal or existential quantification. *)
238
+
239
+ Fixpoint predicate_all (l : list Type) : predicate l -> Prop :=
240
+ match l with
241
+ | nil => fun f => f
242
+ | A :: tl => fun f => forall x : A, predicate_all tl (f x)
243
+ end.
244
+
245
+ Fixpoint predicate_exists (l : list Type) : predicate l -> Prop :=
246
+ match l with
247
+ | nil => fun f => f
248
+ | A :: tl => fun f => exists x : A, predicate_exists tl (f x)
249
+ end.
250
+
251
+ (** Pointwise extension of a binary operation on [T] to a binary operation
252
+ on functions whose codomain is [T].
253
+ For an operator on [Prop] this lifts the operator to a binary operation. *)
254
+
255
+ Fixpoint pointwise_extension {T : Type} (op : binary_operation T)
256
+ (l : list Type) : binary_operation (arrows l T) :=
257
+ match l with
258
+ | nil => fun R R' => op R R'
259
+ | A :: tl => fun R R' =>
260
+ fun x => pointwise_extension op tl (R x) (R' x)
261
+ end.
262
+
263
+ (** Pointwise lifting, equivalent to doing [pointwise_extension] and closing using [predicate_all]. *)
264
+
265
+ Fixpoint pointwise_lifting (op : binary_relation Prop) (l : list Type) : binary_relation (predicate l) :=
266
+ match l with
267
+ | nil => fun R R' => op R R'
268
+ | A :: tl => fun R R' =>
269
+ forall x, pointwise_lifting op tl (R x) (R' x)
270
+ end.
271
+
272
+ (** The n-ary equivalence relation, defined by lifting the 0-ary [iff] relation. *)
273
+
274
+ Definition predicate_equivalence {l : list Type} : binary_relation (predicate l) :=
275
+ pointwise_lifting iff l.
276
+
277
+ (** The n-ary implication relation, defined by lifting the 0-ary [impl] relation. *)
278
+
279
+ Definition predicate_implication {l : list Type} :=
280
+ pointwise_lifting impl l.
281
+
282
+ (** Notations for pointwise equivalence and implication of predicates. *)
283
+
284
+ Infix "<∙>" := predicate_equivalence (at level 95, no associativity) : predicate_scope.
285
+ Infix "-∙>" := predicate_implication (at level 70, right associativity) : predicate_scope.
286
+
287
+ Open Local Scope predicate_scope.
288
+
289
+ (** The pointwise liftings of conjunction and disjunctions.
290
+ Note that these are [binary_operation]s, building new relations out of old ones. *)
291
+
292
+ Definition predicate_intersection := pointwise_extension and.
293
+ Definition predicate_union := pointwise_extension or.
294
+
295
+ Infix "/∙\" := predicate_intersection (at level 80, right associativity) : predicate_scope.
296
+ Infix "\∙/" := predicate_union (at level 85, right associativity) : predicate_scope.
297
+
298
+ (** The always [True] and always [False] predicates. *)
299
+
300
+ Fixpoint true_predicate {l : list Type} : predicate l :=
301
+ match l with
302
+ | nil => True
303
+ | A :: tl => fun _ => @true_predicate tl
304
+ end.
305
+
306
+ Fixpoint false_predicate {l : list Type} : predicate l :=
307
+ match l with
308
+ | nil => False
309
+ | A :: tl => fun _ => @false_predicate tl
310
+ end.
311
+
312
+ Notation "∙⊤∙" := true_predicate : predicate_scope.
313
+ Notation "∙⊥∙" := false_predicate : predicate_scope.
314
+
315
+ (** Predicate equivalence is an equivalence, and predicate implication defines a preorder. *)
316
+
317
+ Program Instance predicate_equivalence_equivalence : Equivalence (@predicate_equivalence l).
318
+ Next Obligation.
319
+ induction l ; firstorder.
320
+ Qed.
321
+ Next Obligation.
322
+ induction l ; firstorder.
323
+ Qed.
324
+ Next Obligation.
325
+ fold pointwise_lifting.
326
+ induction l. firstorder.
327
+ intros. simpl in *. pose (IHl (x x0) (y x0) (z x0)).
328
+ firstorder.
329
+ Qed.
330
+
331
+ Program Instance predicate_implication_preorder :
332
+ PreOrder (@predicate_implication l).
333
+ Next Obligation.
334
+ induction l ; firstorder.
335
+ Qed.
336
+ Next Obligation.
337
+ induction l. firstorder.
338
+ unfold predicate_implication in *. simpl in *.
339
+ intro. pose (IHl (x x0) (y x0) (z x0)). firstorder.
340
+ Qed.
341
+
342
+ (** We define the various operations which define the algebra on binary relations,
343
+ from the general ones. *)
344
+
345
+ Definition relation_equivalence {A : Type} : relation (relation A) :=
346
+ @predicate_equivalence (_::_::nil).
347
+
348
+ Class subrelation {A:Type} (R R' : relation A) : Prop :=
349
+ is_subrelation : @predicate_implication (A::A::nil) R R'.
350
+
351
+ Implicit Arguments subrelation [[A]].
352
+
353
+ Definition relation_conjunction {A} (R : relation A) (R' : relation A) : relation A :=
354
+ @predicate_intersection (A::A::nil) R R'.
355
+
356
+ Definition relation_disjunction {A} (R : relation A) (R' : relation A) : relation A :=
357
+ @predicate_union (A::A::nil) R R'.
358
+
359
+ (** Relation equivalence is an equivalence, and subrelation defines a partial order. *)
360
+
361
+ Set Automatic Introduction.
362
+
363
+ Instance relation_equivalence_equivalence (A : Type) :
364
+ Equivalence (@relation_equivalence A).
365
+ Proof. exact (@predicate_equivalence_equivalence (A::A::nil)). Qed.
366
+
367
+ Instance relation_implication_preorder A : PreOrder (@subrelation A).
368
+ Proof. exact (@predicate_implication_preorder (A::A::nil)). Qed.
369
+
370
+ (** *** Partial Order.
371
+ A partial order is a preorder which is additionally antisymmetric.
372
+ We give an equivalent definition, up-to an equivalence relation
373
+ on the carrier. *)
374
+
375
+ Class PartialOrder {A} eqA `{equ : Equivalence A eqA} R `{preo : PreOrder A R} :=
376
+ partial_order_equivalence : relation_equivalence eqA (relation_conjunction R (inverse R)).
377
+
378
+ (** The equivalence proof is sufficient for proving that [R] must be a morphism
379
+ for equivalence (see Morphisms).
380
+ It is also sufficient to show that [R] is antisymmetric w.r.t. [eqA] *)
381
+
382
+ Instance partial_order_antisym `(PartialOrder A eqA R) : ! Antisymmetric A eqA R.
383
+ Proof with auto.
384
+ reduce_goal.
385
+ pose proof partial_order_equivalence as poe. do 3 red in poe.
386
+ apply <- poe. firstorder.
387
+ Qed.
388
+
389
+ (** The partial order defined by subrelation and relation equivalence. *)
390
+
391
+ Program Instance subrelation_partial_order :
392
+ ! PartialOrder (relation A) relation_equivalence subrelation.
393
+
394
+ Next Obligation.
395
+ Proof.
396
+ unfold relation_equivalence in *. firstorder.
397
+ Qed.
398
+
399
+ Typeclasses Opaque arrows predicate_implication predicate_equivalence
400
+ relation_equivalence pointwise_lifting.
401
+
402
+ (** Rewrite relation on a given support: declares a relation as a rewrite
403
+ relation for use by the generalized rewriting tactic.
404
+ It helps choosing if a rewrite should be handled
405
+ by the generalized or the regular rewriting tactic using leibniz equality.
406
+ Users can declare an [RewriteRelation A RA] anywhere to declare default
407
+ relations. This is also done automatically by the [Declare Relation A RA]
408
+ commands. *)
409
+
410
+ Class RewriteRelation {A : Type} (RA : relation A).
411
+
412
+ Instance: RewriteRelation impl.
413
+ Instance: RewriteRelation iff.
414
+ Instance: RewriteRelation (@relation_equivalence A).
415
+
416
+ (** Any [Equivalence] declared in the context is automatically considered
417
+ a rewrite relation. *)
418
+
419
+ Instance equivalence_rewrite_relation `(Equivalence A eqA) : RewriteRelation eqA.
420
+
421
+ (** Strict Order *)
422
+
423
+ Class StrictOrder {A : Type} (R : relation A) := {
424
+ StrictOrder_Irreflexive :> Irreflexive R ;
425
+ StrictOrder_Transitive :> Transitive R
426
+ }.
427
+
428
+ Instance StrictOrder_Asymmetric `(StrictOrder A R) : Asymmetric R.
429
+ Proof. firstorder. Qed.
430
+
431
+ (** Inversing a [StrictOrder] gives another [StrictOrder] *)
432
+
433
+ Lemma StrictOrder_inverse `(StrictOrder A R) : StrictOrder (inverse R).
434
+ Proof. firstorder. Qed.
435
+
436
+ (** Same for [PartialOrder]. *)
437
+
438
+ Lemma PreOrder_inverse `(PreOrder A R) : PreOrder (inverse R).
439
+ Proof. firstorder. Qed.
440
+
441
+ Hint Extern 3 (StrictOrder (inverse _)) => class_apply StrictOrder_inverse : typeclass_instances.
442
+ Hint Extern 3 (PreOrder (inverse _)) => class_apply PreOrder_inverse : typeclass_instances.
443
+
444
+ Lemma PartialOrder_inverse `(PartialOrder A eqA R) : PartialOrder eqA (inverse R).
445
+ Proof. firstorder. Qed.
446
+
447
+ Hint Extern 3 (PartialOrder (inverse _)) => class_apply PartialOrder_inverse : typeclass_instances.