You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2016/09/02 07:27:38 UTC
svn commit: r1758889 -
/directory/shared/branches/shared-value/ldap/model/src/main/antlr/distinguishedName.g
Author: elecharny
Date: Fri Sep 2 07:27:38 2016
New Revision: 1758889
URL: http://svn.apache.org/viewvc?rev=1758889&view=rev
Log:
Updated Javadocs
Modified:
directory/shared/branches/shared-value/ldap/model/src/main/antlr/distinguishedName.g
Modified: directory/shared/branches/shared-value/ldap/model/src/main/antlr/distinguishedName.g
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/antlr/distinguishedName.g?rev=1758889&r1=1758888&r2=1758889&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/antlr/distinguishedName.g (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/antlr/distinguishedName.g Fri Sep 2 07:27:38 2016
@@ -184,14 +184,13 @@ options {
* name = name-component *("," name-component)
*
* RFC 1779, Section 2.3
- * <name> ::= <name-component> ( <spaced-separator> )
- * | <name-component> <spaced-separator> <name>
- * <spaced-separator> ::= <optional-space>
- * <separator>
- * <optional-space>
- * <separator> ::= "," | ";"
- * <optional-space> ::= ( <CR> ) *( " " )
- *
+ * <name> ::= <name-component> ( <spaced-separator> )
+ * | <name-component> <spaced-separator> <name>
+ * <spaced-separator> ::= <optional-space>
+ * <separator>
+ * <optional-space>
+ * <separator> ::= "," | ";"
+ * <optional-space> ::= ( <CR> ) *( " " )
*/
distinguishedName [SchemaManager schemaManager, Dn dn]
{
@@ -246,13 +245,13 @@ distinguishedName [SchemaManager schemaM
* name = name-component *("," name-component)
*
* RFC 1779, Section 2.3
- * <name> ::= <name-component> ( <spaced-separator> )
- * | <name-component> <spaced-separator> <name>
- * <spaced-separator> ::= <optional-space>
- * <separator>
- * <optional-space>
- * <separator> ::= "," | ";"
- * <optional-space> ::= ( <CR> ) *( " " )
+ * <name> ::= <name-component> ( <spaced-separator> )
+ * | <name-component> <spaced-separator> <name>
+ * <spaced-separator> ::= <optional-space>
+ * <separator>
+ * <optional-space>
+ * <separator> ::= "," | ";"
+ * <optional-space> ::= ( <CR> ) *( " " )
*
*/
relativeDistinguishedNames [SchemaManager schemaManager, List<Rdn> rdns] returns [String normNameStr]
@@ -297,9 +296,9 @@ relativeDistinguishedNames [SchemaManage
* name-component = attributeTypeAndValue *("+" attributeTypeAndValue)
*
* RFC 1779, Section 2.3
- * <name-component> ::= <attribute>
- * | <attribute> <optional-space> "+"
- * <optional-space> <name-component>
+ * <name-component> ::= <attribute>
+ * | <attribute> <optional-space> "+"
+ * <optional-space> <name-component>
*
*/
relativeDistinguishedName [SchemaManager schemaManager, Rdn rdn]
@@ -611,7 +610,7 @@ attributeValue [UpAndNormValue value]
/**
* RFC 2253, Section 3
* / QUOTATION *( quotechar / pair ) QUOTATION ; only from v2
- * quotechar = <any character except "\" or QUOTATION >
+ * quotechar = <any character except "\" or QUOTATION >
*
*/
quotestring [UpAndNormValue value]
@@ -637,16 +636,16 @@ quotestring [UpAndNormValue value]
;
- /**
- * RFC 4514 Section 3
- *
- * hexstring = SHARP 1*hexpair
- *
- * If in <hexstring> form, a BER representation can be obtained from
- * converting each <hexpair> of the <hexstring> to the octet indicated
- * by the <hexpair>.
- *
- */
+/**
+ * RFC 4514 Section 3
+ *
+ * hexstring = SHARP 1*hexpair
+ *
+ * If in <hexstring> form, a BER representation can be obtained from
+ * converting each <hexpair> of the <hexstring> to the octet indicated
+ * by the <hexpair>.
+ *
+ */
hexstring [UpAndNormValue value]
{
matchedProduction( "hexstring()" );
@@ -662,17 +661,17 @@ hexstring [UpAndNormValue value]
;
- /**
- * RFC 4514 Section 3
- *
- * ; The following characters are to be escaped when they appear
- * ; in the value to be encoded: ESC, one of <escaped>, leading
- * ; SHARP or SPACE, trailing SPACE, and NULL.
- * string = [ ( leadchar / pair ) [ *( stringchar / pair ) ( trailchar / pair ) ] ]
- * leadchar = LUTF1 | UTFMB
- * stringchar = SUTF1 / UTFMB
- * trailchar = TUTF1 / UTFMB
- */
+/**
+ * RFC 4514 Section 3
+ *
+ * ; The following characters are to be escaped when they appear
+ * ; in the value to be encoded: ESC, one of <escaped>, leading
+ * ; SHARP or SPACE, trailing SPACE, and NULL.
+ * string = [ ( leadchar / pair ) [ *( stringchar / pair ) ( trailchar / pair ) ] ]
+ * leadchar = LUTF1 | UTFMB
+ * stringchar = SUTF1 / UTFMB
+ * trailchar = TUTF1 / UTFMB
+ */
string [UpAndNormValue value]
{
matchedProduction( "string()" );
@@ -849,66 +848,6 @@ sutf1 [UpAndNormValue value]
;
-/**
- * RFC 4514, Section 3:
- * TUTF1 = %x01-1F / %x21 / %x23-2A / %x2D-3A /
- * %x3D / %x3F-5B / %x5D-7F
- *
- * The rule CHAR_REST doesn't contain the following charcters,
- * so we must check them additionally
- * EQUALS (0x3D)
- * HYPHEN (0x2D)
- * UNDERSCORE (0x5F)
- * DIGIT (0x30-0x39)
- * ALPHA (0x41-0x5A and 0x61-0x7A)
- * SHARP (0x23)
- *
-tutf1 [UpAndNormValue value]
- {
- matchedProduction( "tutf1()" );
- }
- :
- rest:CHAR_REST
- {
- char c = rest.getText().charAt( 0 );
- value.upValue.append( c );
- value.bytes.append( ( byte ) c );
- }
- |
- EQUALS
- {
- value.upValue.append( '=' );
- value.bytes.append( '=' );
- }
- |
- HYPHEN
- {
- value.upValue.append( '-' );
- value.bytes.append( '-' );
- }
- |
- UNDERSCORE
- {
- value.upValue.append( '_' );
- value.bytes.append( '_' );
- }
- |
- digit:DIGIT
- {
- char c = digit.getText().charAt( 0 );
- value.upValue.append( c );
- value.bytes.append( ( byte ) c );
- }
- |
- alpha:ALPHA
- {
- char c = alpha.getText().charAt( 0 );
- value.upValue.append( c );
- value.bytes.append( ( byte ) c );
- }
- ;
-*/
-
utfmb [UpAndNormValue value]
{
matchedProduction( "utfmb()" );
@@ -942,8 +881,8 @@ utfmb [UpAndNormValue value]
* special = "," / "=" / "+" / "<" / ">" / "#" / ";"
*
* RFC 1779, Section 2.3
- * <pair> ::= "\" ( <special> | "\" | '"')
- * <special> ::= "," | "=" | <CR> | "+" | "<" | ">"
+ * <pair> ::= "\" ( <special> | "\" | '"')
+ * <special> ::= "," | "=" | <CR> | "+" | "<" | ">"
* | "#" | ";"
*
*/