Author: pkluegl Date: Thu Sep 1 07:53:54 2016 New Revision: 1758721 URL: http://svn.apache.org/viewvc?rev=1758721&view=rev Log: UIMA-5091 - fixed some programlistings
Modified: uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.howtos.xml uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.language.syntax.xml uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.language.xml uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.overview.xml Modified: uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.howtos.xml URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.howtos.xml?rev=1758721&r1=1758720&r2=1758721&view=diff ============================================================================== --- uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.howtos.xml (original) +++ uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.howtos.xml Thu Sep 1 07:53:54 2016 @@ -263,7 +263,8 @@ The|DT rabbit|NN made|VBD up|RP this|DT A FileSet specifying the UIMA Ruta script files that should be built. If this parameter is not specified, then all UIMA Ruta script files - in the output directory (e.g., target/classes) of the project will be built. + in the output directory (e.g., target/classes) of the project will + be built. default value: none <scriptFiles> @@ -288,8 +289,8 @@ The|DT rabbit|NN made|VBD up|RP this|DT <analysisEngineOutputDirectory>${project.build.directory}/ generated-sources/ruta/descriptor</analysisEngineOutputDirectory> - <!-- The template descriptor for the generated type system. By default the - descriptor of the maven dependency is loaded. --> + <!-- The template descriptor for the generated type system. + By default the descriptor of the maven dependency is loaded. --> <!-- default value: none --> <!-- not used in this example <typeSystemTemplate>... </typeSystemTemplate> --> Modified: uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.language.syntax.xml URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.language.syntax.xml?rev=1758721&r1=1758720&r2=1758721&view=diff ============================================================================== --- uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.language.syntax.xml (original) +++ uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.language.syntax.xml Thu Sep 1 07:53:54 2016 @@ -83,9 +83,11 @@ VariableDeclaration -> (("TYPE" Identifi ("," Identifier)* ("=" NumberExpression)?) | ("BOOLEAN" Identifier ("," Identifier)* ("=" BooleanExpression)?) - | ("ANNOTATION" Identifier ("=" AnnotationExpression)?) - | ("WORDLIST" Identifier ("=" WordListExpression | StringExpression)?) - | ("WORDTABLE" Identifier ("=" WordTableExpression | StringExpression)?) + | ("ANNOTATION" Identifier("="AnnotationExpression)?) + | ("WORDLIST" Identifier ("=" WordListExpression + | StringExpression)?) + | ("WORDTABLE" Identifier ("=" WordTableExpression + | StringExpression)?) | ("TYPELIST" Identifier ("=" TypeListExpression)?) | ("STRINGLIST" Identifier ("=" StringListExpression)?) @@ -102,13 +104,13 @@ BasicAnnotationType -> ('COLON'| 'SW' | | 'SENTENCEEND' | 'W' | 'PM' | 'ANY' | 'ALL' | 'SPACE' | 'BREAK') BlockDeclaration -> "BLOCK" "(" Identifier ")" RuleElementWithCA - "{" Statements "}"]]></programlisting> -actionDeclaration -> "ACTION" Identifier "(" ("VAR"? VarType Identifier)? - ("," "VAR"? VarType Identifier)*")" + "{" Statements "}" +actionDeclaration -> "ACTION" Identifier "(" ("VAR"? VarType + Identifier)? ("," "VAR"? VarType Identifier)*")" "=" Action ( "," Action)* ";" -conditionDeclaration-> "CONDITION" Identifier "(" ("VAR"? VarType Identifier)? - ("," "VAR"? VarType Identifier)*")" - "=" Condition ( "," Condition)* ";" +conditionDeclaration-> "CONDITION" Identifier "(" ("VAR"? VarType + Identifier)? ("," "VAR"? VarType Identifier)*")" + "=" Condition ( "," Condition)* ";"]]></programlisting> Syntax of statements and rule elements: <programlisting><![CDATA[SimpleStatement -> SimpleRule | RegExpRule | ConjunctRules | DocumentActionRule @@ -155,7 +157,8 @@ Actions -> "->" Action ( <para> It is also possible to use specific expression as implicit conditions or action additionally to the set of available conditions and actions. <programlisting><![CDATA[Condition -> BooleanExpression | FeatureMatchExpression -Action -> TypeExpression | FeatureAssignmentExpression | VariableAssignmentExpression +Action -> TypeExpression | FeatureAssignmentExpression + | VariableAssignmentExpression ]]></programlisting> Modified: uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.language.xml URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.language.xml?rev=1758721&r1=1758720&r2=1758721&view=diff ============================================================================== --- uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.language.xml (original) +++ uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.language.xml Thu Sep 1 07:53:54 2016 @@ -850,8 +850,7 @@ WORDTABLE presidentsOfUSA = "" + package construct, and ignore all filtering settings. </para> - <programlisting><![CDATA[ -RegExpRule -> StringExpression "->" GroupAssignment + <programlisting><![CDATA[RegExpRule -> StringExpression "->" GroupAssignment ("," GroupAssignment)* ";" GroupAssignment -> TypeExpression FeatureAssignment? | NumberEpxression "=" TypeExpression Modified: uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.overview.xml URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.overview.xml?rev=1758721&r1=1758720&r2=1758721&view=diff ============================================================================== --- uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.overview.xml (original) +++ uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.overview.xml Thu Sep 1 07:53:54 2016 @@ -391,7 +391,8 @@ Sentence{CONTAINS(EmploymentIndicator) - <programlisting><![CDATA[DECLARE Annotation EmplRelation (Employee employeeRef, Employer employerRef); e1:Employer # EmploymentIndicator # e2:Employee) - {-> EmplRelation, EmplRelation.employeeRef=e2, EmplRelation.employerRef=e1};]]></programlisting> + {-> EmplRelation, EmplRelation.employeeRef=e2, + EmplRelation.employerRef=e1};]]></programlisting> <para> Global variables for annotations are declared like other variables and are able to store annotations