precompute attribute format for context & rules
ClosedPublic
Actions

Authored by cullmann on Sep 1 2018, 3:36 PM.

Details

Reviewers

vkrause
dhaumann

Commits

R216:2321fc443483: try to fix unit tests
R216:91d29a45389e: precompute attribute format for context & rules
R216:7af02d6b955e: handle nested include attributes done in ocaml yacc

Summary

avoid costly lookup, e.g. 3% of runtime of highlighting

simplifies the highlightLine stuff, as we only need to keep track of format changes,
not lookup contexts in addition

fixes that we don't see that formats change if name is equal in different
definitions

accessors are inline, the classes are internal anyways

Test Plan

make && make test

updated references, now we properly applyFormat if we walk from one into a other
definition with same name formats

Diff Detail

Repository

R216 Syntax Highlighting

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

cullmann created this revision.Sep 1 2018, 3:36 PM

Restricted Application added projects: Kate, Frameworks. · View Herald TranscriptSep 1 2018, 3:36 PM

Restricted Application added subscribers: kde-frameworks-devel, kwrite-devel. · View Herald Transcript

cullmann requested review of this revision.Sep 1 2018, 3:36 PM

Harbormaster completed remote builds in B2414: Diff 40825.Sep 1 2018, 3:36 PM

inline MatchResult, very often used, no need to waste time for calls

fix scoping in Repository::definitionForMimeType

Harbormaster completed remote builds in B2415: Diff 40826.Sep 1 2018, 3:44 PM

I inlined the MatchResult, it is used the whole time and given it is purely internal, one doesn't need to waste cycles for having calls to get the two ints and the reference to the stringlist.
The implicit constructor now doesn't play around with the stringlist either.

vkrause accepted this revision.Sep 1 2018, 4:06 PM

This revision is now accepted and ready to land.Sep 1 2018, 4:06 PM

Closed by commit R216:91d29a45389e: precompute attribute format for context & rules (authored by cullmann). · Explain WhySep 1 2018, 4:09 PM

This revision was automatically updated to reflect the committed changes.

Hmm, tests are unstable :/
I did run them here now X times, they are stable. Perhaps depending on which highlightings got parsed in which order.
Why should then the id's be equal for different definitions?

e.g.

QDEBUG : TestHighlighterTest::testHighlight(test.py) Using syntax "Python"

"/home/jenkins/workspace/Frameworks syntax-highlighting kf5-qt5 SUSEQt5.9/autotests/reference/test.py.ref" 2018-09-01 16:10:03.327043830 +0000

+++ "/home/jenkins/workspace/Frameworks syntax-highlighting kf5-qt5 SUSEQt5.9/build/autotests/output/test.py.ref" 2018-09-01 16:13:08.885670252 +0000
@@ -1,6 +1,6 @@
-<Comment>#</Comment><Comment> comment with </Comment><Alert Level 1>ALERT</Alert Level 1> 
+<Comment># comment with </Comment><Alert Level 1>ALERT</Alert Level 1> 
<Normal Text></Normal Text> 
-<Comment>'''</Comment><Comment> multiline</Comment> 
+<Comment>''' multiline</Comment> 
<Comment> comment</Comment> 
<Comment> </Comment><Alert Level 3>###</Alert Level 3> 
<Comment> '''</Comment>

This revision is now accepted and ready to land.Sep 1 2018, 4:26 PM

Closed by commit R216:2321fc443483: try to fix unit tests (authored by cullmann). · Explain WhySep 1 2018, 4:52 PM

This revision was automatically updated to reflect the committed changes.

:=)

The second lookup round over all included rules in the context did really hide some things.

Now we properly keep track which context is needed to be used for the lookup.

2321fc443483fb5669f9092980c7ab25bf78778d
7af02d6b955ef60ac7e9666b2694c461500d52bc

Revision Contents
Changeset List

			Path	Packages
M			autotests/html/csharp.cs.html (2 lines)
M			autotests/html/highlight.hs.html (54 lines)
M			autotests/html/highlight.cmake.html (2 lines)
M			autotests/html/highlight.cpp.html (2 lines)
M			autotests/html/highlight.css.html (2 lines)
M			autotests/html/highlight.dox.html (96 lines)
M			autotests/html/highlight.js.html (50 lines)
M			autotests/html/highlight.lhs.html (2 lines)
M			autotests/html/highlight.lua.html (38 lines)
M			autotests/html/highlight.qml.html (2 lines)
M			autotests/html/highlight.tex.html (10 lines)
M			autotests/html/highlight.y.html (4 lines)
M			autotests/html/modelines.py.html (14 lines)
M			autotests/html/test.htm.html (2 lines)
M			autotests/html/test.Rd.html (2 lines)
M			autotests/html/test.coffee.html (10 lines)
M			autotests/html/test.js.html (30 lines)
M			autotests/html/test.py.html (12 lines)
M			autotests/html/test.qml.html (2 lines)
M			autotests/html/test.te.html (2 lines)
M			autotests/reference/csharp.cs.ref (2 lines)
M			autotests/reference/highlight.hs.ref (54 lines)
M			autotests/reference/highlight.cmake.ref (2 lines)
M			autotests/reference/highlight.cpp.ref (2 lines)
M			autotests/reference/highlight.css.ref (138 lines)
M			autotests/reference/highlight.dox.ref (96 lines)
M			autotests/reference/highlight.js.ref (54 lines)
M			autotests/reference/highlight.lhs.ref (2 lines)
M			autotests/reference/highlight.lua.ref (38 lines)
M			autotests/reference/highlight.qml.ref (2 lines)
M			autotests/reference/highlight.tex.ref (10 lines)
M			autotests/reference/highlight.y.ref (4 lines)
M			autotests/reference/modelines.py.ref (14 lines)
M			autotests/reference/review128925-1.css.ref (18 lines)
M			autotests/reference/review128925-2.css.ref (10 lines)
M			autotests/reference/test.htm.ref (6 lines)
M			autotests/reference/test.Rd.ref (2 lines)
M			autotests/reference/test.coffee.ref (4 lines)
M			autotests/reference/test.js.ref (10 lines)
M			autotests/reference/test.py.ref (12 lines)
M			autotests/reference/test.qml.ref (2 lines)
M			autotests/reference/test.te.ref (2 lines)
M			src/lib/context.cpp (37 lines)
M			src/lib/context_p.h (7 lines)
M			src/lib/rule.cpp (11 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	40825	2475bc4		Sep 1 2018, 3:36 PM	★	★
Diff 2	40826	2475bc4	inline MatchResult, very often used, no need to waste time for calls	Sep 1 2018, 3:44 PM	★	★
Diff 3	40827	2475bc4	R216:91d29a45389ea26d078598d9e0c8472dcbb41b04	Sep 1 2018, 4:08 PM	★	★
Diff 4	40830	ad66b98	R216:2321fc443483fb5669f9092980c7ab25bf78778d	Sep 1 2018, 4:51 PM	★	★

Commit	Tree	Parents	Author	Summary	Date
837827d9e97c	397c1fd07408	2475bc4dd2ca	Christoph Cullmann	precompute attribute format for context & rules (Show More…)	Sep 1 2018, 3:35 PM

precompute attribute format for context & rulesClosedPublicActions

Details

Diff Detail

Revision ContentsChangeset List

Diff 40830

autotests/html/csharp.cs.html

autotests/html/highlight.hs.html

autotests/html/highlight.cmake.html

autotests/html/highlight.cpp.html

autotests/html/highlight.css.html

autotests/html/highlight.dox.html

autotests/html/highlight.js.html

autotests/html/highlight.lhs.html

autotests/html/highlight.lua.html

autotests/html/highlight.qml.html

autotests/html/highlight.tex.html

autotests/html/highlight.y.html

autotests/html/modelines.py.html

autotests/html/test.htm.html

autotests/html/test.Rd.html

autotests/html/test.coffee.html

autotests/html/test.js.html

autotests/html/test.py.html

autotests/html/test.qml.html

autotests/html/test.te.html

autotests/reference/csharp.cs.ref

autotests/reference/highlight.hs.ref

autotests/reference/highlight.cmake.ref

autotests/reference/highlight.cpp.ref

autotests/reference/highlight.css.ref

autotests/reference/highlight.dox.ref

autotests/reference/highlight.js.ref

autotests/reference/highlight.lhs.ref

autotests/reference/highlight.lua.ref

autotests/reference/highlight.qml.ref

autotests/reference/highlight.tex.ref

autotests/reference/highlight.y.ref

autotests/reference/modelines.py.ref

autotests/reference/review128925-1.css.ref

autotests/reference/review128925-2.css.ref

autotests/reference/test.htm.ref

autotests/reference/test.Rd.ref

autotests/reference/test.coffee.ref

autotests/reference/test.js.ref

autotests/reference/test.py.ref

autotests/reference/test.qml.ref

autotests/reference/test.te.ref

src/lib/context.cpp

src/lib/context_p.h

src/lib/rule.cpp

precompute attribute format for context & rules
ClosedPublic
Actions

Revision Contents
Changeset List