Skip to content

Commit

Permalink
Merge branch 'master' into set-java-home-setup-commands
Browse files Browse the repository at this point in the history
* master:
  [Test] Fix docs check for DEB package in packaging tests (elastic#30126)
  Painless: Docs Clean Up (elastic#29592)
  Fixes Eclipse build for sql jdbc project (elastic#30114)
  Remove reference to `not_analyzed`.
  [Docs] Add community analysis plugin (elastic#29612)
  Remove the suggest metric from stats APIs (elastic#29635)
  Fix byte size value equals/hash code test (elastic#29643)
  Upgrade to Gradle 4.7 (elastic#29644)
  • Loading branch information
jasontedor committed Apr 25, 2018
2 parents a300732 + df42358 commit 8c2dbda
Show file tree
Hide file tree
Showing 27 changed files with 248 additions and 229 deletions.
2 changes: 2 additions & 0 deletions docs/CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
<<write-thread-pool-fallback, Removed `thread_pool.bulk.*` settings and
`es.thread_pool.write.use_bulk_as_display_name` system property>> ({pull}29609[#29609])

<<remove-suggest-metric, Removed `suggest` metric on stats APIs>> ({pull}29635[#29635])

=== Breaking Java Changes

=== Deprecations
Expand Down
22 changes: 11 additions & 11 deletions docs/painless/painless-comments.asciidoc
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[[painless-comments]]
=== Comments

Painless supports both single-line and multi-line comments. Comments can be
included anywhere within a script. Use the `//` token anywhere on a line to
specify a single-line comment. All characters from the `//` token to the end
of the line are ignored. Use an opening `/*` token and a closing `*/` token
to specify a multi-line comment. Multi-line comments can start anywhere on a
line, and all characters in between the `/*` token and `*/` token are ignored.
Use the `//` token anywhere on a line to specify a single-line comment. All
characters from the `//` token to the end of the line are ignored. Use an
opening `/*` token and a closing `*/` token to specify a multi-line comment.
Multi-line comments can start anywhere on a line, and all characters in between
the `/*` token and `*/` token are ignored. Comments can be included anywhere
within a script.

*Grammar*
[source,ANTLR4]
Expand All @@ -17,17 +17,17 @@ MULTI_LINE_COMMENT: '/*' .*? '*/';

*Examples*

Single-line comments.

* Single-line comments.
+
[source,Painless]
----
// single-line comment
int value; // single-line comment
----

Multi-line comments.

+
* Multi-line comments.
+
[source,Painless]
----
/* multi-
Expand Down
29 changes: 29 additions & 0 deletions docs/painless/painless-identifiers.asciidoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
[[painless-identifiers]]
=== Identifiers

Specify identifiers to <<declaration, declare>>, <<assignment, assign>>, and
<<painless-operators, use>> variables, <<dot-operator, access fields>>, and
<<dot-operator, call methods>>. <<painless-keywords, Keywords>> and
<<painless-types, types>> cannot be used as identifiers.

*Grammar*
[source,ANTLR4]
----
ID: [_a-zA-Z] [_a-zA-Z-0-9]*;
----

*Examples*

* Variations of identifiers.
+
[source,Painless]
----
a
Z
id
list
list0
MAP25
_map25
Map_25
----
4 changes: 2 additions & 2 deletions docs/painless/painless-keywords.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
=== Keywords

The keywords in the table below are reserved for built-in language
features. These keywords cannot be used as <<identifiers, identifiers>> or
<<painless-types, types>>.
features. These keywords cannot be used as
<<painless-identifiers, identifiers>> or <<painless-types, types>>.

[cols="^1,^1,^1,^1,^1"]
|====
Expand Down
2 changes: 2 additions & 0 deletions docs/painless/painless-lang-spec.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ include::painless-keywords.asciidoc[]

include::painless-literals.asciidoc[]

include::painless-identifiers.asciidoc[]

include::painless-variables.asciidoc[]

include::painless-types.asciidoc[]
Expand Down
73 changes: 36 additions & 37 deletions docs/painless/painless-literals.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@ HEX: '-'? '0' [xX] [0-9a-fA-F]+ [lL]?;

*Examples*

Integer literals.

* Integer literals.
+
[source,Painless]
----
0 <1>
0D <2>
1234L <3>
-90f <4>
-022 <5>
0xF2A <6>
<1> 0
<2> 0D
<3> 1234L
<4> -90f
<5> -022
<6> 0xF2A
----

+
<1> `int 0`
<2> `double 0.0`
<3> `long 1234`
Expand All @@ -61,17 +61,17 @@ EXPONENT: ( [eE] [+\-]? [0-9]+ );

*Examples*

Floating point literals.

* Floating point literals.
+
[source,Painless]
----
0.0 <1>
1E6 <2>
0.977777 <3>
-126.34 <4>
89.9F <5>
<1> 0.0
<2> 1E6
<3> 0.977777
<4> -126.34
<5> 89.9F
----

+
<1> `double 0.0`
<2> `double 1000000.0` in exponent notation
<3> `double 0.977777`
Expand All @@ -81,12 +81,11 @@ Floating point literals.
[[strings]]
==== Strings

Use string literals to specify string values of the
<<string-type, String type>> with either single-quotes or double-quotes.
Use a `\"` token to include a double-quote as part of a double-quoted string
literal. Use a `\'` token to include a single-quote as part of a single-quoted
string literal. Use a `\\` token to include a backslash as part of any string
literal.
Use string literals to specify <<string-type, String>> values with
either single-quotes or double-quotes. Use a `\"` token to include a
double-quote as part of a double-quoted string literal. Use a `\'` token to
include a single-quote as part of a single-quoted string literal. Use a `\\`
token to include a backslash as part of any string literal.

*Grammar*
[source,ANTLR4]
Expand All @@ -97,22 +96,22 @@ STRING: ( '"' ( '\\"' | '\\\\' | ~[\\"] )*? '"' )

*Examples*

String literals using single-quotes.

* String literals using single-quotes.
+
[source,Painless]
----
'single-quoted string literal'
'\'single-quoted string with escaped single-quotes\' and backslash \\'
'single-quoted string with non-escaped "double-quotes"'
'\'single-quoted with escaped single-quotes\' and backslash \\'
'single-quoted with non-escaped "double-quotes"'
----

String literals using double-quotes.

+
* String literals using double-quotes.
+
[source,Painless]
----
"double-quoted string literal"
"\"double-quoted string with escaped double-quotes\" and backslash: \\"
"double-quoted string with non-escaped 'single-quotes'"
"\"double-quoted with escaped double-quotes\" and backslash: \\"
"double-quoted with non-escaped 'single-quotes'"
----

[[characters]]
Expand All @@ -126,16 +125,16 @@ or an error will occur.

*Examples*

Casting string literals into <<primitive-types, char>> values.

* Casting string literals into <<primitive-types, char>> values.
+
[source,Painless]
----
(char)"C"
(char)'c'
----

Casting a <<string-type, String>> value into a <<primitive-types, char>> value.

+
* Casting a <<string-type, String>> value into a <<primitive-types, char>> value.
+
[source,Painless]
----
String s = "s";
Expand Down
1 change: 1 addition & 0 deletions docs/painless/painless-operators.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,7 @@ e = ~d; // sets e the negation of d

The cast operator can be used to explicitly convert one type to another. See casting [MARK] for more information.

[[constructor-call]]
==== Constructor Call

A constructor call is a special type of method call [MARK] used to allocate a reference type instance using the new operator. The format is the new operator followed by a type, an opening parenthesis, arguments if any, and a closing parenthesis. Arguments are a series of zero-to-many expressions delimited by commas. Auto-boxing and auto-unboxing will be applied automatically for arguments passed into a constructor call. See boxing and unboxing [MARK] for more information on this topic. Constructor argument types can always be resolved at run-time; if appropriate type conversions (casting) cannot be applied an error will occur. Once a reference type instance has been allocated, its members may be used as part of other expressions.
Expand Down
Loading

0 comments on commit 8c2dbda

Please sign in to comment.