diff options
| author | acolyer <acolyer> | 2004-12-09 09:13:53 +0000 |
|---|---|---|
| committer | acolyer <acolyer> | 2004-12-09 09:13:53 +0000 |
| commit | 3ef5bec3f1cd6c13e966551fee5d7eeed6110914 (patch) | |
| tree | d7244773b9087daa946617717b5723280e776c8a | |
| parent | a4d5eeba2909a5ba1814b5c21fe6a21747882fcb (diff) | |
| download | aspectj-3ef5bec3f1cd6c13e966551fee5d7eeed6110914.tar.gz aspectj-3ef5bec3f1cd6c13e966551fee5d7eeed6110914.zip | |
fixed some alignment issues in grammar fragments
| -rw-r--r-- | docs/adk15ProgGuideDB/annotations.xml | 33 | ||||
| -rw-r--r-- | docs/adk15ProgGuideDB/grammar.xml | 50 |
2 files changed, 41 insertions, 42 deletions
diff --git a/docs/adk15ProgGuideDB/annotations.xml b/docs/adk15ProgGuideDB/annotations.xml index dab312c43..9905350f3 100644 --- a/docs/adk15ProgGuideDB/annotations.xml +++ b/docs/adk15ProgGuideDB/annotations.xml @@ -287,11 +287,10 @@ </para> <programlisting><![CDATA[ - AnnotationPattern := '@' AnnotationTypePattern AnnotationPattern* | - '!' AnnotationPattern + AnnotationPattern := '!'? '@' AnnotationTypePattern AnnotationPattern* - AnnotationTypePattern := FullyQualifiedName | - '(' TypePattern ')' + AnnotationTypePattern := FullyQualifiedName | + '(' TypePattern ')' FullyQualifiedName := JavaIdentifierCharacter+ ('.' JavaIdentifierCharacter+)* ]]></programlisting> @@ -363,11 +362,11 @@ prefix. (Extensions to this definition for generics are shown in the next chapter).</para> <programlisting><![CDATA[ - TypePattern := SimpleTypePattern | - '!' TypePattern | - '(' AnnotationPattern? TypePattern ')' - TypePattern '&&' TypePattern | - TypePattern '||' TypePattern | + TypePattern := SimpleTypePattern | + '!' TypePattern | + '(' AnnotationPattern? TypePattern ')' + TypePattern '&&' TypePattern | + TypePattern '||' TypePattern | SimpleTypePattern := DottedNamePattern '+'? '[]'* @@ -473,7 +472,7 @@ FieldModifier := 'public' | 'private' | 'protected' | 'static' | 'transient' | 'final' - DotOrDotDot := '.' | '..' + DotOrDotDot := '.' | '..' SimpleNamePattern := JavaIdentifierChar+ ('*' SimpleNamePattern)? ]]></programlisting> @@ -729,18 +728,18 @@ <programlisting><![CDATA[ AtThis := '@this' '(' AnnotationOrIdentifer ')' - AtTarget := '@target' '(' AnnotationOrIdentifier ')' + AtTarget := '@target' '(' AnnotationOrIdentifier ')' AnnotationOrIdentifier := '@' FullyQualifiedName | Identifier - AtArgs := '@args' '(' AnnotationsOrIdentifiersPattern ')' + AtArgs := '@args' '(' AnnotationsOrIdentifiersPattern ')' - AnnotationsOrIdentifiersPattern := - '..' (',' AnnotationsOrIdentifiersPatternAfterDotDot)? | - AnnotationOrIdentifier (',' AnnotationsOrIdentifiersPattern)* | - '*' (',' AnnotationsOrIdentifiersPattern)* + AnnotationsOrIdentifiersPattern := + '..' (',' AnnotationsOrIdentifiersPatternAfterDotDot)? | + AnnotationOrIdentifier (',' AnnotationsOrIdentifiersPattern)* | + '*' (',' AnnotationsOrIdentifiersPattern)* - AnnotationsOrIdentifiersPatternAfterDotDot := + AnnotationsOrIdentifiersPatternAfterDotDot := AnnotationOrIdentifier (',' AnnotationsOrIdentifiersPatternAfterDotDot)* | '*' (',' AnnotationsOrIdentifiersPatternAfterDotDot)* diff --git a/docs/adk15ProgGuideDB/grammar.xml b/docs/adk15ProgGuideDB/grammar.xml index 42ed65644..740e3fa7a 100644 --- a/docs/adk15ProgGuideDB/grammar.xml +++ b/docs/adk15ProgGuideDB/grammar.xml @@ -5,29 +5,29 @@ <programlisting><![CDATA[ === type patterns === - TypePattern := SimpleTypePattern | + TypePattern := SimpleTypePattern | '!' TypePattern | '(' AnnotationPattern? TypePattern ')' TypePattern '&&' TypePattern | TypePattern '||' TypePattern | - SimpleTypePattern := DottedNamePattern '+'? '[]'* + SimpleTypePattern := DottedNamePattern '+'? '[]'* - DottedNamePattern := FullyQualifiedName RestOfNamePattern? | + DottedNamePattern := FullyQualifiedName RestOfNamePattern? | '*' NotStarNamePattern? - RestOfNamePattern := '..' DottedNamePattern | + RestOfNamePattern := '..' DottedNamePattern | '*' NotStarNamePattern? - NotStarNamePattern := FullyQualifiedName RestOfNamePattern? | + NotStarNamePattern := FullyQualifiedName RestOfNamePattern? | '..' DottedNamePattern - FullyQualifiedName := JavaIdentifierCharacter+ ('.' JavaIdentifierCharacter+)* + FullyQualifiedName := JavaIdentifierCharacter+ ('.' JavaIdentifierCharacter+)* === annotation patterns === - AnnotationPattern := '@' AnnotationTypePattern AnnotationPattern* | - '!' AnnotationPattern + AnnotationPattern := '!'? '@' AnnotationTypePattern AnnotationPattern* + AnnotationTypePattern := FullyQualifiedName | '(' TypePattern ')' @@ -40,14 +40,14 @@ AnnotationPattern? FieldModifiersPattern? TypePattern (TypePattern DotOrDotDot)? SimpleNamePattern - FieldModifiersPattern := '!'? FieldModifier FieldModifiersPattern* + FieldModifiersPattern := '!'? FieldModifier FieldModifiersPattern* - FieldModifier := 'public' | 'private' | 'protected' | 'static' | + FieldModifier := 'public' | 'private' | 'protected' | 'static' | 'transient' | 'final' - DotOrDotDot := '.' | '..' + DotOrDotDot := '.' | '..' - SimpleNamePattern := JavaIdentifierChar+ ('*' SimpleNamePattern)? + SimpleNamePattern := JavaIdentifierChar+ ('*' SimpleNamePattern)? -- method -- @@ -56,33 +56,33 @@ (TypePattern DotOrDotDot)? SimpleNamePattern '(' FormalsPattern ')' ThrowsPattern? - MethodModifiersPattern := '!'? MethodModifier MethodModifiersPattern* + MethodModifiersPattern := '!'? MethodModifier MethodModifiersPattern* - MethodModifier := 'public' | 'private' | 'protected' | 'static' | + MethodModifier := 'public' | 'private' | 'protected' | 'static' | 'synchronized' | 'final' - FormalsPattern := '..' (',' FormalsPatternAfterDotDot)? | + FormalsPattern := '..' (',' FormalsPatternAfterDotDot)? | OptionalParensTypePattern (',' FormalsPattern)* | TypePattern '...' - FormalsPatternAfterDotDot := + FormalsPatternAfterDotDot := OptionalParensTypePattern (',' FormalsPatternAfterDotDot)* | TypePattern '...' - ThrowsPattern := 'throws' TypePatternList + ThrowsPattern := 'throws' TypePatternList - TypePatternList := TypePattern (',' TypePattern)* + TypePatternList := TypePattern (',' TypePattern)* - -- constructor -- + -- constructor -- ConstructorPattern := AnnotationPattern? ConstructorModifiersPattern? (TypePattern DotOrDotDot)? 'new' '(' FormalsPattern ')' ThrowsPattern? - ConstructorModifiersPattern := '!'? ConstructorModifier ConstructorModifiersPattern* + ConstructorModifiersPattern := '!'? ConstructorModifier ConstructorModifiersPattern* - ConstructorModifier := 'public' | 'private' | 'protected' + ConstructorModifier := 'public' | 'private' | 'protected' === Pointcuts === @@ -128,7 +128,7 @@ TypeOrIdentifier (',' FormalsOrIdentifiersPattern)* | '*' (',' FormalsOrIdentifiersPattern)* - FormalsOrIdentifiersPatternAfterDotDot := + FormalsOrIdentifiersPatternAfterDotDot := TypeOrIdentifier (',' FormalsOrIdentifiersPatternAfterDotDot)* | '*' (',' FormalsOrIdentifiersPatternAfterDotDot)* @@ -144,10 +144,10 @@ AnnotationsOrIdentifiersPattern := '..' (',' AnnotationsOrIdentifiersPatternAfterDotDot)? | - AnnotationOrIdentifier (',' AnnotationsOrIdentifiersPattern)* | - '*' (',' AnnotationsOrIdentifiersPattern)* + AnnotationOrIdentifier (',' AnnotationsOrIdentifiersPattern)* | + '*' (',' AnnotationsOrIdentifiersPattern)* - AnnotationsOrIdentifiersPatternAfterDotDot := + AnnotationsOrIdentifiersPatternAfterDotDot := AnnotationOrIdentifier (',' AnnotationsOrIdentifiersPatternAfterDotDot)* | '*' (',' AnnotationsOrIdentifiersPatternAfterDotDot)* |