branch: elpa/swift-mode
commit acfc7fdf026532845fa433ad466149063a93e859
Author: taku0 <mxxouy6x3m_git...@tatapa.org>
Commit: taku0 <mxxouy6x3m_git...@tatapa.org>
Fix comments
---
Makefile | 1 +
doc/string_properties.png | Bin 39997 -> 67323 bytes
doc/string_properties.svg | 30 +++++++++++++++---------------
swift-mode-lexer.el | 4 +++-
4 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/Makefile b/Makefile
index aba79f6..c19102f 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,7 @@ help:
# Process this Makefile with following filters
#
# - Remove empty line.
+# - Remove line starting with whitespace, dot, or uppercase letters.
# - Remove line containing ## no-doc.
# - Remove after colon if the line is not a comment line.
# - Replace /^## / to " ".
diff --git a/doc/string_properties.png b/doc/string_properties.png
index e0faf35..6de2f53 100644
Binary files a/doc/string_properties.png and b/doc/string_properties.png differ
diff --git a/doc/string_properties.svg b/doc/string_properties.svg
index ea77c63..dc8a30b 100644
--- a/doc/string_properties.svg
+++ b/doc/string_properties.svg
@@ -14,7 +14,7 @@
viewBox="0 0 510 320.00002"
version="1.1"
id="svg8"
- inkscape:version="0.92.0 r15299"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="string_properties.svg"
inkscape:export-filename="string_properties.png"
inkscape:export-xdpi="96"
@@ -137,9 +137,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="2"
- inkscape:cx="247.2539"
- inkscape:cy="118.79165"
+ inkscape:zoom="2.8284271"
+ inkscape:cx="276.53379"
+ inkscape:cy="148.42232"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
@@ -169,7 +169,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- <dc:title></dc:title>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -361,7 +361,7 @@
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:24px;font-family:'DejaVu
Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono,
Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#8b2252;fill-opacity:1"
id="tspan4621"> \(<tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:24px;font-family:'DejaVu
Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono,
Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000"
- id="tspan4611"></tspan></tspan><tspan
+ id="tspan4611" /></tspan><tspan
sodipodi:role="line"
x="197"
y="918.76184"
@@ -370,7 +370,7 @@
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:24px;font-family:'DejaVu
Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono,
Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000"
id="tspan4627"> fox()<tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:24px;font-family:'DejaVu
Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono,
Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#8b2252;fill-opacity:1"
- id="tspan4609"></tspan></tspan></tspan><tspan
+ id="tspan4609" /></tspan></tspan><tspan
sodipodi:role="line"
x="197"
y="942.76184"
@@ -396,15 +396,15 @@
id="tspan4642"><tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:24px;font-family:'DejaVu
Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono,
Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000"
id="tspan4644"><tspan
-
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:24px;font-family:'DejaVu
Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono,
Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#8b2252;fill-opacity:1"
- id="tspan4646"> \(</tspan></tspan></tspan><tspan
+
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:24px;font-family:'DejaVu
Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono,
Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#8b2252;fill-opacity:1"
+ id="tspan4646"> \(</tspan></tspan></tspan><tspan
sodipodi:role="line"
x="197"
y="1014.7618"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:24px;font-family:'DejaVu
Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono,
Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#8b2252;fill-opacity:1"
id="tspan4648"><tspan
-
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:24px;font-family:'DejaVu
Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono,
Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000"
- id="tspan4650"> dog()</tspan></tspan><tspan
+
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:24px;font-family:'DejaVu
Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono,
Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000"
+ id="tspan4650"> dog()</tspan></tspan><tspan
sodipodi:role="line"
x="197"
y="1038.7618"
@@ -559,13 +559,13 @@
style="line-height:12px;fill:#0080ff;fill-opacity:1">(location of the
matching parenthesis)</tspan></text>
<path
style="fill:none;fill-rule:evenodd;stroke:#0080ff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 189,1002.5196 31,1"
+ d="m 189,1002.5196 30,24.0001"
id="path5996"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
style="fill:none;fill-rule:evenodd;stroke:#0080ff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 189,1002.5196 37,6"
+ d="m 189,1002.5196 42,-10.99995"
id="path5998"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
@@ -588,13 +588,13 @@
<path
inkscape:connector-curvature="0"
id="path6018"
- d="m 189,906.51965 31,0.99997"
+ d="m 189,906.51965 30,24"
style="fill:none;fill-rule:evenodd;stroke:#0080ff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
sodipodi:nodetypes="cc" />
<path
inkscape:connector-curvature="0"
id="path6020"
- d="m 189,906.51965 37,5.99997"
+ d="m 189,906.51965 42,-11"
style="fill:none;fill-rule:evenodd;stroke:#0080ff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
sodipodi:nodetypes="cc" />
<path
diff --git a/swift-mode-lexer.el b/swift-mode-lexer.el
index 38187fc..326e750 100644
--- a/swift-mode-lexer.el
+++ b/swift-mode-lexer.el
@@ -61,6 +61,8 @@
;; or interpolated expressions.
;; Suppose a string "aaa\( foo() )bbb\( bar() )ccc",
;; "aaa\(, )bbb\(, and )ccc" are string chunks.
+;;
+;; This is not a official term; used only in swift-mode.
(declare-function swift-mode:backward-sexps-until "swift-mode-indent.el"
(token-types
@@ -358,7 +360,7 @@ pound signs."
A position is escaped if it is proceeded by POUND-COUNT or more of pound signs
and odd number of backslashes.
-Return nil otherwise." ;; FIXME pound-count
+Return nil otherwise."
(let ((p position)
(backslash-count 0))
(while (eq (char-before p) ?#)
