I2P_Developers/i2p.www
3
0
Fork 5
Code Issues 27 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

More DataSpec tweaks

Browse Source
This commit is contained in:
str4d
2013-06-12 02:12:44 +00:00
parent 6d206a117f
commit faf12aadbe
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
i2p2www/lexers.py
View File

@ -31,12 +31,14 @@ class DataSpecLexer(RegexLexer):
], ],
'expression': [ 'expression': [
(r'(\s*)(\))', bygroups(Text, Punctuation), '#pop'), (r'(\s*)(\))', bygroups(Text, Punctuation), '#pop'),
(r'(\s*)(\+)', bygroups(Text, Punctuation)), (r'(\s*)([+-])', bygroups(Text, Operator)),
(r'(\s*)(\$\w+)', bygroups(Text, Name.Tag)),
(r'(\s*)(\w+)', bygroups(Text, Name)), (r'(\s*)(\w+)', bygroups(Text, Name)),
], ],
'definition': [ 'definition': [
(r'(\s*)([\w=;]+)(\s)(::)(\s)', bygroups(Text, Name.Tag, Text, Operator, Text)), (r'(\s*)([\w=;]+)(\s)(::)(\s)', bygroups(Text, Name.Tag, Text, Operator, Text)),
(r'(\s*)((?:[A-Z][a-z]+)+)', bygroups(Text, Name.Class)), (r'(\s*)((?:[A-Z][a-z]+)+)', bygroups(Text, Name.Class)),
(r'(\s*)([A-Z]{2,})', bygroups(Text, Name.Constant)),
(r'(\s*)([\[\]])', bygroups(Text, Punctuation)), (r'(\s*)([\[\]])', bygroups(Text, Punctuation)),
(r'(\s*)(\$\w+)', bygroups(Text, Name.Tag)), (r'(\s*)(\$\w+)', bygroups(Text, Name.Tag)),
(r'(\s*)([0-9]+)(\+)?', bygroups(Text, Number, Punctuation)), (r'(\s*)([0-9]+)(\+)?', bygroups(Text, Number, Punctuation)),

12
i2p2www/pages/site/docs/spec/common-structures.html
View File

@ -234,20 +234,20 @@ A 2-byte size Integer followed by a series of String=String; pairs
{% endtrans %}</p> {% endtrans %}</p>
{% highlight lang='dataspec' %} {% highlight lang='dataspec' %}
+----+----+----+----+----+----+----+----+ +----+----+----+----+----+----+----+----+
| size |key string (len + data) | = | | size |key_string (len + data) | = |
+----+----+----+----+----+----+----+----+ +----+----+----+----+----+----+----+----+
| val string (len + data) | ; | ... | val_string (len + data) | ; | ...
+----+----+----+----+----+----+----+ +----+----+----+----+----+----+----+
size :: Integer size :: Integer
length -> 2 bytes length -> 2 bytes
Total number of bytes that follow Total number of bytes that follow
key string :: String key_string :: String
A string (one byte length followed by UTF-8 encoded characters) A string (one byte length followed by UTF-8 encoded characters)
= :: A single byte containing '=' = :: A single byte containing '='
val string :: String val_string :: String
A string (one byte length followed by UTF-8 encoded characters) A string (one byte length followed by UTF-8 encoded characters)
; :: A single byte containing ';' ; :: A single byte containing ';'
@ -329,7 +329,7 @@ signing_key :: SigningPublicKey
certificate :: Certificate certificate :: Certificate
length -> >= 3 bytes length -> >= 3 bytes
Total length: 387+ bytes total length: 387+ bytes
{% endhighlight %} {% endhighlight %}
<h4>{% trans %}Notes{% endtrans %}</h4> <h4>{% trans %}Notes{% endtrans %}</h4>
@ -378,7 +378,7 @@ signing_public_key :: SigningPublicKey
certificate :: Certificate certificate :: Certificate
length -> >= 3 bytes length -> >= 3 bytes
Total length: 387+ bytes total length: 387+ bytes
{% endhighlight %} {% endhighlight %}
<h4><a href="http://docs.i2p-projekt.de/javadoc/net/i2p/data/Destination.html">Javadoc</a></h4> <h4><a href="http://docs.i2p-projekt.de/javadoc/net/i2p/data/Destination.html">Javadoc</a></h4>