Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 75ad14b

Browse files
committed
Merge branch 'develop' into refactor-graphics
2 parents 5d3391a + da90581 commit 75ad14b

303 files changed

Lines changed: 6703 additions & 1893 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ engine/src/startupstack.cpp
77
engine/src/linuxstubs.cpp
88
engine/include/revbuild.h
99
lcidlc/src/EncodedSupport.c
10+
lcidlc/src/EncodedJavaSupport.c
11+
*/derived_src/*
1012
IMarketBillingService.java
1113
crypt.cpp
1214
crypt.h
@@ -64,6 +66,8 @@ Thumbs.db
6466
#########################
6567
*.pbxuser
6668
*.perspectivev3
69+
*.xcworkspace
70+
*.xcworkspacedata
6771
xcuserdata/
6872
*.vcproj.*.user
6973
*.ncb
@@ -74,3 +78,7 @@ xcuserdata/
7478
_build/
7579
_cache/
7680
build/
81+
82+
# SDKs #
83+
#################
84+
sdks/

Makefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,15 +137,18 @@ server-revdb: libexternal
137137
###############################################################################
138138
# revXML Targets
139139

140-
.PHONY: libxml revxml server-revxml
140+
.PHONY: libxml libxslt revxml server-revxml
141141

142142
libxml:
143143
$(MAKE) -C ./thirdparty/libxml libxml
144144

145-
revxml: libxml libexternal
145+
libxslt:
146+
$(MAKE) -C ./thirdparty/libxslt libxslt
147+
148+
revxml: libxml libxslt libexternal
146149
$(MAKE) -C ./revxml revxml
147150

148-
server-revxml: libxml libexternal
151+
server-revxml: libxml libxslt libexternal
149152
$(MAKE) -C ./revxml server-revxml
150153

151154
###############################################################################

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,9 @@ At the moment you need to use Visual C++ 2005 to build the engine on Windows alo
9898
* Microsoft Windows Platform SDK 6.1:
9999

100100
http://www.microsoft.com/en-us/download/details.aspx?id=24826
101+
* Follow these Windows SDK integration instructions for Visual C++ Express:
102+
103+
http://msdn.microsoft.com/en-us/library/ms235626(v=vs.80).aspx
101104
* QuickTime SDK (requires Apple Developer account to download):
102105

103106
https://developer.apple.com/downloads/index.action?=quicktime

docs/dictionary/command/filter.xml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<name>filter</name>
44
<type>command</type>
55
<syntax>
6-
<example>filter <i>container</i> {with | without} <i>filterPattern</i></example>
6+
<example>filter [{lines | items} of] <i>containerOrExpression</i> {with | without | [not] matching} [{wildcard | regex} [pattern] <i>filterPattern</i>< [into <i>targetConteiner</i>]/example>
77
</syntax>
88
<library></library>
99
<objects>
@@ -17,13 +17,14 @@
1717
<property tag="caseSensitive">caseSensitive Property</property>
1818
<function tag="matchChunk">matchChunk Function</function>
1919
<function tag="matchText">matchText Function</function>
20+
<function tag="replaceText">replaceText Function</function>
2021
<command tag="replace">replace Command</command>
2122
<command tag="sort">sort Command</command>
22-
<function tag="replaceText">replaceText Function</function>
2323
</references>
2424
<history>
2525
<introduced version="1.0">Added.</introduced>
2626
<changed version="2.1.1"></changed>
27+
<changed version="6.1"></changed>
2728
</history>
2829
<platforms>
2930
<mac/>
@@ -40,14 +41,18 @@
4041
</classes>
4142
<security>
4243
</security>
43-
<summary>Filters each <keyword tag="line">line</keyword> in a <glossary tag="container">container</glossary>, removing the <keyword tag="lines">lines</keyword> that do or don't match a pattern.</summary>
44+
<summary>Filters each <keyword tag="line">line</keyword> or <keyword tag="item">item</keyword> in a source <glossary tag="container">container</glossary> or <glossary tag="expression">expression</glossary>, removing the <keyword tag="lines">lines</keyword> or <keyword tag="lines">items</keyword> that do or don't match a pattern.</summary>
4445
<examples>
4546
<example>filter myVariable with "A?2"</example>
4647
<example>filter me without "*[a-zA-Z]*"</example>
4748
<example>filter field 22 with "[0-9]*"</example>
4849
<example>filter field "Sorted Lines" with "[" &amp; mySelection &amp; "]"</example>
50+
<example>filter items of theList matching regex pattern "b.*"</example>
51+
<example>filter items of theList with wildcard pattern "b*" into theFilteredList</example>
52+
<example>filter lines of (theFirstList & return & theSecondList) not matching "b*"</example>
53+
<example>
4954
</examples>
5055
<description>
51-
<p>Use the <b>filter</b> command to pick specific <keyword tag="lines">lines</keyword> in a <glossary tag="container">container</glossary>.</p><p/><p><b>Parameters:</b></p><p>The <i>container</i> is any <glossary tag="expression">expression</glossary> that <glossary tag="evaluate">evaluates</glossary> to a <glossary tag="container">container</glossary>.</p><p/><p>The <i>filterPattern</i> is an expression used to match certain <keyword tag="lines">lines</keyword>.</p><p/><p><b>Comments:</b></p><p>The filter...with form places the lines that contain a match for the specified <i>filterPattern</i> in the <i>container</i>, replacing the previous contents.</p><p/><p>The filter...without form places the lines that do not contain a match for the specified <i>filterPattern</i> in the <i>container</i>, replacing the previous contents.</p><p/><p>A <i>filterPattern</i> consists of a string of characters to match which may be combined with any number of the following special characters:</p><p/><p><b>*</b></p><p>Matches zero or more of any character. The <i>filterPattern</i> A*C matches "AC", "ABC", or "ADZXC".</p><p/><p><b>?</b></p><p>Matches exactly one character. The <i>filterPattern</i> A?C matches "ABC", but not "AC" or "ADZXC".</p><p/><p><b>[<i>chars</i>]</b></p><p>Matches any one of the characters inside the brackets. The <i>filterPattern</i> A[BC]D matches "ABD" or "ACD", but not "AD" or "ABCD".</p><p/><p><b>[<i>char</i>-<i>char</i>]</b></p><p>Matches any character whose ASCII value is between the first character and the second character.</p><p/><p><b>Changes:</b></p><p>The filter...without form was added in version 2.1.1. In previous versions, the <b>filter</b> <glossary tag="command">command</glossary> could be used only to retrieve <keyword tag="lines">lines</keyword> that matched a <glossary tag="wildcard">wildcard expression</glossary>.</p>
56+
<p>Use the <b>filter</b> command to pick specific <keyword tag="lines">lines</keyword> or <keyword tag="items">items</keyword> in a <glossary tag="container">container</glossary> or <glossary tag="expression">expression</glossary>.</p><p/><p><b>Parameters:</b></p><p>The <i>container</i> is any <glossary tag="expression">expression</glossary> that <glossary tag="evaluate">evaluates</glossary> to a <glossary tag="container">container</glossary>.</p><p/><p>The <i>filterPattern</i> is an expression used to match certain <keyword tag="lines">lines</keyword> or <keyword tag="items">items</keyword>.</p><p/><p><b>Comments:</b></p><p>The filter...with form and the filter...matching form retain the lines or items that contain a match for the specified <i>filterPattern</i>.</p><p/><p>The filter...without form and the filter...not matching form discard the lines or items that do not contain a match for the specified <i>filterPattern</i>.</p><p/><p>A <glossary tag="wildcard">wildcard</glossary> <i>filterPattern</i> consists of a string of characters to match which may be combined with any number of the following special characters:</p><p/><p><b>*</b></p><p>Matches zero or more of any character. The <i>filterPattern</i> A*C matches "AC", "ABC", or "ADZXC".</p><p/><p><b>?</b></p><p>Matches exactly one character. The <i>filterPattern</i> A?C matches "ABC", but not "AC" or "ADZXC".</p><p/><p><b>[<i>chars</i>]</b></p><p>Matches any one of the characters inside the brackets. The <i>filterPattern</i> A[BC]D matches "ABD" or "ACD", but not "AD" or "ABCD".</p><p/><p><b>[<i>char</i>-<i>char</i>]</b></p><p>Matches any character whose ASCII value is between the first character and the second character.</p><p/><p><b>Changes:</b></p><p>The filter...without form was added in version 2.1.1. In previous versions, the <b>filter</b> <glossary tag="command">command</glossary> could be used only to retrieve <keyword tag="lines">lines</keyword> that matched a <glossary tag="wildcard">wildcard expression</glossary>.</p><p>The filter items... form was added in version 6.1. In previous versions, the <b>filter</b> <glossary tag="command">command</glossary> could be used only to retrieve <keyword tag="lines">lines</keyword>.</p><p>The ability to filter using a <glossary tag="regular expression">regular expression</glossary> was added in version 6.1. In previous versions, the <b>filter</b> <glossary tag="command">command</glossary> only supported <glossary tag="wildcard">wildcard expressions</glossary>.</p><p>The ability to filter an <glossary tag="expression">expression</glossary> was added in version 6.1. In previous versions, the <b>filter</b> <glossary tag="command">command</glossary> could be used only for a <glossary tag="container">container</glossary>.</p><p>The filter...[not] matching form was added in version 6.1 to clarify the pattern handling.</p><p>The filter...into form was added in version 6.1. In previous versions, the <b>filter</b> <glossary tag="command">command</glossary> always replaced the contents of the original <glossary tag="container">container</glossary>.</p>
5257
</description>
5358
</doc>

docs/dictionary/command/intersect.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<name>intersect</name>
44
<type>command</type>
55
<syntax>
6-
<example>intersect <i>array</i> with <i>templateArray</i></example>
6+
<example>intersect <i>array</i> with <i>templateArray</i> [recursively]</example>
77
</syntax>
88
<library></library>
99
<objects>
@@ -19,6 +19,7 @@
1919
</references>
2020
<history>
2121
<introduced version="1.1">Added.</introduced>
22+
<introduced version="6.5">Added nested array support.</introduced>
2223
</history>
2324
<platforms>
2425
<mac/>
@@ -38,8 +39,9 @@
3839
<summary>Removes <glossary tag="element">elements</glossary> from an <glossary tag="array">array</glossary> if they have no corresponding <keyword tag="element">element</keyword> in another <glossary tag="array">array</glossary>.</summary>
3940
<examples>
4041
<example>intersect myArray with the templateData of this stack</example>
42+
<example>intersect myArray with theTemplate recursively</example>
4143
</examples>
4244
<description>
43-
<p>Use the <b>intersect</b> <glossary tag="command">command</glossary> to filter out <glossary tag="element">elements</glossary> from an <glossary tag="array">array</glossary> according to the contents of another <glossary tag="array">array</glossary>.</p><p/><p><b>Parameters:</b></p><p>The <i>array</i> is any <glossary tag="array">array</glossary> <glossary tag="variable">variable</glossary>.</p><p/><p>The <i>templateArray</i> is any <glossary tag="array">array</glossary> <glossary tag="variable">variable</glossary>.</p><p/><p><b>Comments:</b></p><p>Each key of the <i>array</i> is checked to see whether there is a matching <glossary tag="key">key</glossary> in the <i>templateArray</i>. The <glossary tag="element">elements</glossary> of <i>array</i> that do not match an <keyword tag="element">element</keyword> of the <i>templateArray</i> are removed from the <i>array</i>.</p><p/><p>The content of individual elements of the <i>templateArray</i> does not affect the final result. Only which <glossary tag="element">elements</glossary> exist in the <i>templateArray</i>, not their content, controls which <glossary tag="element">elements</glossary> of the <i>array</i> are retained and which are removed. If the <i>array</i> and <i>templateArray</i> have the same set of <glossary tag="element">elements</glossary> but different content in each <keyword tag="element">element</keyword>, the <b>intersect</b> <glossary tag="command">command</glossary> does not change the value of the <i>array</i>.</p>
45+
<p>Use the <b>intersect</b> <glossary tag="command">command</glossary> to filter out <glossary tag="element">elements</glossary> from an <glossary tag="array">array</glossary> according to the contents of another <glossary tag="array">array</glossary>.</p><p/><p><b>Parameters:</b></p><p>The <i>array</i> is any <glossary tag="array">array</glossary> <glossary tag="variable">variable</glossary>.</p><p/><p>The <i>templateArray</i> is any <glossary tag="array">array</glossary> <glossary tag="variable">variable</glossary>.</p><p>The <i>recursively</i> adverb indicates that the intersect should recurse through nested arrays.</p><p/><p><b>Comments:</b></p><p>Each key of the <i>array</i> is checked to see whether there is a matching <glossary tag="key">key</glossary> in the <i>templateArray</i>. The <glossary tag="element">elements</glossary> of <i>array</i> that do not match an <keyword tag="element">element</keyword> of the <i>templateArray</i> are removed from the <i>array</i>.</p><p/><p>The content of individual elements of the <i>templateArray</i> does not affect the final result. Only which <glossary tag="element">elements</glossary> exist in the <i>templateArray</i>, not their content, controls which <glossary tag="element">elements</glossary> of the <i>array</i> are retained and which are removed. If the <i>array</i> and <i>templateArray</i> have the same set of <glossary tag="element">elements</glossary> but different content in each <keyword tag="element">element</keyword>, the <b>intersect</b> <glossary tag="command">command</glossary> does not change the value of the <i>array</i>.</p>
4446
</description>
4547
</doc>

0 commit comments

Comments
 (0)