@caspertech/node-metaverse 0.6.3 → 0.6.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/classes/ObjectStoreLite.js +6 -6
- package/dist/lib/classes/ObjectStoreLite.js.map +1 -1
- package/dist/lib/classes/commands/CommunicationsCommands.js +21 -0
- package/dist/lib/classes/commands/CommunicationsCommands.js.map +1 -1
- package/dist/lib/classes/commands/FriendCommands.js +3 -0
- package/dist/lib/classes/commands/FriendCommands.js.map +1 -1
- package/dist/lib/classes/commands/GroupCommands.js +9 -0
- package/dist/lib/classes/commands/GroupCommands.js.map +1 -1
- package/dist/lib/classes/llsd/LLSDArray.d.ts +5 -0
- package/dist/lib/classes/llsd/LLSDArray.js +45 -0
- package/dist/lib/classes/llsd/LLSDArray.js.map +1 -0
- package/dist/lib/classes/llsd/LLSDMap.d.ts +10 -0
- package/dist/lib/classes/llsd/LLSDMap.js +94 -0
- package/dist/lib/classes/llsd/LLSDMap.js.map +1 -0
- package/dist/lib/classes/llsd/LLSDNotationParser.d.ts +9 -0
- package/dist/lib/classes/llsd/LLSDNotationParser.js +183 -0
- package/dist/lib/classes/llsd/LLSDNotationParser.js.map +1 -0
- package/dist/lib/classes/llsd/LLSDNotationParser.spec.d.ts +1 -0
- package/dist/lib/classes/llsd/LLSDNotationParser.spec.js +167 -0
- package/dist/lib/classes/llsd/LLSDNotationParser.spec.js.map +1 -0
- package/dist/lib/classes/llsd/LLSDObject.d.ts +4 -0
- package/dist/lib/classes/llsd/LLSDObject.js +10 -0
- package/dist/lib/classes/llsd/LLSDObject.js.map +1 -0
- package/dist/lib/classes/llsd/LLSDToken.d.ts +10 -0
- package/dist/lib/classes/llsd/LLSDToken.js +3 -0
- package/dist/lib/classes/llsd/LLSDToken.js.map +1 -0
- package/dist/lib/classes/llsd/LLSDTokenContainer.d.ts +7 -0
- package/dist/lib/classes/llsd/LLSDTokenContainer.js +3 -0
- package/dist/lib/classes/llsd/LLSDTokenContainer.js.map +1 -0
- package/dist/lib/classes/llsd/LLSDTokenGenerator.d.ts +2 -0
- package/dist/lib/classes/llsd/LLSDTokenGenerator.js +3 -0
- package/dist/lib/classes/llsd/LLSDTokenGenerator.js.map +1 -0
- package/dist/lib/classes/llsd/LLSDTokenSpec.d.ts +5 -0
- package/dist/lib/classes/llsd/LLSDTokenSpec.js +3 -0
- package/dist/lib/classes/llsd/LLSDTokenSpec.js.map +1 -0
- package/dist/lib/classes/llsd/LLSDTokenType.d.ts +22 -0
- package/dist/lib/classes/llsd/LLSDTokenType.js +27 -0
- package/dist/lib/classes/llsd/LLSDTokenType.js.map +1 -0
- package/dist/lib/classes/llsd/LLSDType.d.ts +4 -0
- package/dist/lib/classes/llsd/LLSDType.js +3 -0
- package/dist/lib/classes/llsd/LLSDType.js.map +1 -0
- package/dist/lib/classes/messages/ImprovedInstantMessage.d.ts +3 -0
- package/dist/lib/classes/messages/ImprovedInstantMessage.js +9 -1
- package/dist/lib/classes/messages/ImprovedInstantMessage.js.map +1 -1
- package/dist/lib/classes/python/PythonDict.js +6 -2
- package/dist/lib/classes/python/PythonDict.js.map +1 -1
- package/dist/lib/classes/python/PythonParser.js +5 -4
- package/dist/lib/classes/python/PythonParser.js.map +1 -1
- package/dist/lib/classes/python/PythonParser.spec.js +8 -0
- package/dist/lib/classes/python/PythonParser.spec.js.map +1 -1
- package/dist/lib/classes/python/PythonSet.js +2 -0
- package/dist/lib/classes/python/PythonSet.js.map +1 -1
- package/dist/lib/classes/python/PythonTokenType.js +2 -2
- package/dist/lib/classes/python/PythonTokenType.js.map +1 -1
- package/package.json +1 -1
|
@@ -25,6 +25,9 @@ export declare class ImprovedInstantMessageMessage implements MessageBase {
|
|
|
25
25
|
Message: Buffer;
|
|
26
26
|
BinaryBucket: Buffer;
|
|
27
27
|
};
|
|
28
|
+
EstateBlock: {
|
|
29
|
+
EstateID: number;
|
|
30
|
+
};
|
|
28
31
|
getSize(): number;
|
|
29
32
|
writeToBuffer(buf: Buffer, pos: number): number;
|
|
30
33
|
readFromBuffer(buf: Buffer, pos: number): number;
|
|
@@ -12,7 +12,7 @@ class ImprovedInstantMessageMessage {
|
|
|
12
12
|
this.id = Message_1.Message.ImprovedInstantMessage;
|
|
13
13
|
}
|
|
14
14
|
getSize() {
|
|
15
|
-
return (this.MessageBlock['FromAgentName'].length + 1 + this.MessageBlock['Message'].length + 2 + this.MessageBlock['BinaryBucket'].length + 2) +
|
|
15
|
+
return (this.MessageBlock['FromAgentName'].length + 1 + this.MessageBlock['Message'].length + 2 + this.MessageBlock['BinaryBucket'].length + 2) + 107;
|
|
16
16
|
}
|
|
17
17
|
writeToBuffer(buf, pos) {
|
|
18
18
|
const startPos = pos;
|
|
@@ -46,6 +46,8 @@ class ImprovedInstantMessageMessage {
|
|
|
46
46
|
pos += 2;
|
|
47
47
|
this.MessageBlock['BinaryBucket'].copy(buf, pos);
|
|
48
48
|
pos += this.MessageBlock['BinaryBucket'].length;
|
|
49
|
+
buf.writeUInt32LE(this.EstateBlock['EstateID'], pos);
|
|
50
|
+
pos += 4;
|
|
49
51
|
return pos - startPos;
|
|
50
52
|
}
|
|
51
53
|
readFromBuffer(buf, pos) {
|
|
@@ -101,6 +103,12 @@ class ImprovedInstantMessageMessage {
|
|
|
101
103
|
newObjMessageBlock['BinaryBucket'] = buf.slice(pos, pos + varLength);
|
|
102
104
|
pos += varLength;
|
|
103
105
|
this.MessageBlock = newObjMessageBlock;
|
|
106
|
+
const newObjEstateBlock = {
|
|
107
|
+
EstateID: 0
|
|
108
|
+
};
|
|
109
|
+
newObjEstateBlock['EstateID'] = buf.readUInt32LE(pos);
|
|
110
|
+
pos += 4;
|
|
111
|
+
this.EstateBlock = newObjEstateBlock;
|
|
104
112
|
return pos - startPos;
|
|
105
113
|
}
|
|
106
114
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ImprovedInstantMessage.js","sourceRoot":"","sources":["../../../../lib/classes/messages/ImprovedInstantMessage.ts"],"names":[],"mappings":";;;AAEA,kCAA+B;AAC/B,wCAAqC;AACrC,2DAAwD;AAExD,iDAA8C;AAE9C,MAAa,6BAA6B;IAA1C;QAEI,SAAI,GAAG,wBAAwB,CAAC;QAChC,iBAAY,GAAG,2BAAY,CAAC,SAAS,GAAG,2BAAY,CAAC,YAAY,CAAC;QAClE,OAAE,GAAG,iBAAO,CAAC,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"ImprovedInstantMessage.js","sourceRoot":"","sources":["../../../../lib/classes/messages/ImprovedInstantMessage.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,7 @@ class PythonDict extends PythonObject_1.PythonObject {
|
|
|
20
20
|
case PythonTokenType_1.PythonTokenType.BRACE_END:
|
|
21
21
|
{
|
|
22
22
|
if (isKey) {
|
|
23
|
+
// The last token is a key, which is invalid
|
|
23
24
|
throw new Error('Unexpected end of dictionary: Expected a key-value pair.');
|
|
24
25
|
}
|
|
25
26
|
container.index++;
|
|
@@ -46,16 +47,19 @@ class PythonDict extends PythonObject_1.PythonObject {
|
|
|
46
47
|
default:
|
|
47
48
|
{
|
|
48
49
|
if (isKey) {
|
|
50
|
+
// Parse the key and check its type
|
|
49
51
|
key = PythonParser_1.PythonParser.parseValueToken(container);
|
|
50
52
|
if (typeof key !== 'string' &&
|
|
51
53
|
typeof key !== 'number' &&
|
|
52
54
|
typeof key !== 'boolean' &&
|
|
53
|
-
!(key instanceof PythonTuple_1.PythonTuple) &&
|
|
54
|
-
typeof key !== 'object'
|
|
55
|
+
!(key instanceof PythonTuple_1.PythonTuple) && // Check if it's a PythonTuple
|
|
56
|
+
typeof key !== 'object' // Allow floats
|
|
57
|
+
) {
|
|
55
58
|
throw new Error('Invalid key type in a dictionary.');
|
|
56
59
|
}
|
|
57
60
|
}
|
|
58
61
|
else {
|
|
62
|
+
// Parse the value
|
|
59
63
|
if (key === null) {
|
|
60
64
|
throw new Error('Key cannot be null in a dictionary.');
|
|
61
65
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PythonDict.js","sourceRoot":"","sources":["../../../../lib/classes/python/PythonDict.ts"],"names":[],"mappings":";;;AACA,iDAA8C;AAC9C,uDAAoD;AAEpD,iDAA8C;AAC9C,+CAA4C;AAK5C,MAAa,UAAW,SAAQ,2BAAY;IAA5C;;QAEW,SAAI,GAA+B,IAAI,GAAG,EAAyB,CAAC;IAgG/E,CAAC;IA9FU,MAAM,CAAC,KAAK,CAAC,SAA+B;QAE/C,MAAM,IAAI,GAAG,IAAI,UAAU,EAAE,CAAC;QAE9B,IAAI,KAAK,GAAG,IAAI,CAAC;QACjB,IAAI,GAAG,GAAqB,IAAI,CAAC;QAEjC,OAAO,SAAS,CAAC,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,EAChD;YACI,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAEhD,QAAQ,KAAK,CAAC,IAAI,EAClB;gBACI,KAAK,iCAAe,CAAC,SAAS;oBAC9B;wBACI,IAAI,KAAK,EACT;
|
|
1
|
+
{"version":3,"file":"PythonDict.js","sourceRoot":"","sources":["../../../../lib/classes/python/PythonDict.ts"],"names":[],"mappings":";;;AACA,iDAA8C;AAC9C,uDAAoD;AAEpD,iDAA8C;AAC9C,+CAA4C;AAK5C,MAAa,UAAW,SAAQ,2BAAY;IAA5C;;QAEW,SAAI,GAA+B,IAAI,GAAG,EAAyB,CAAC;IAgG/E,CAAC;IA9FU,MAAM,CAAC,KAAK,CAAC,SAA+B;QAE/C,MAAM,IAAI,GAAG,IAAI,UAAU,EAAE,CAAC;QAE9B,IAAI,KAAK,GAAG,IAAI,CAAC;QACjB,IAAI,GAAG,GAAqB,IAAI,CAAC;QAEjC,OAAO,SAAS,CAAC,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,EAChD;YACI,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAEhD,QAAQ,KAAK,CAAC,IAAI,EAClB;gBACI,KAAK,iCAAe,CAAC,SAAS;oBAC9B;wBACI,IAAI,KAAK,EACT;4BACI,4CAA4C;4BAC5C,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;yBAC/E;wBAED,SAAS,CAAC,KAAK,EAAE,CAAC;wBAClB,OAAO,IAAI,CAAC;qBACf;gBACD,KAAK,iCAAe,CAAC,KAAK;oBAC1B;wBACI,IAAI,CAAC,KAAK,EACV;4BACI,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;yBACvE;wBACD,KAAK,GAAG,KAAK,CAAC;wBACd,SAAS,CAAC,KAAK,EAAE,CAAC;wBAClB,MAAM;qBACT;gBACD,KAAK,iCAAe,CAAC,KAAK;oBAC1B;wBACI,IAAI,KAAK,EACT;4BACI,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;yBAC5D;wBACD,KAAK,GAAG,IAAI,CAAC;wBACb,SAAS,CAAC,KAAK,EAAE,CAAC;wBAClB,MAAM;qBACT;gBACD;oBACA;wBACI,IAAI,KAAK,EACT;4BACI,mCAAmC;4BACnC,GAAG,GAAG,2BAAY,CAAC,eAAe,CAAC,SAAS,CAAc,CAAC;4BAE3D,IACI,OAAO,GAAG,KAAK,QAAQ;gCACvB,OAAO,GAAG,KAAK,QAAQ;gCACvB,OAAO,GAAG,KAAK,SAAS;gCACxB,CAAC,CAAC,GAAG,YAAY,yBAAW,CAAC,IAAI,8BAA8B;gCAC/D,OAAO,GAAG,KAAK,QAAQ,CAAC,eAAe;8BAE3C;gCACI,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;6BACxD;yBACJ;6BAED;4BACI,kBAAkB;4BAClB,IAAI,GAAG,KAAK,IAAI,EAChB;gCACI,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;6BAC1D;4BACD,MAAM,KAAK,GAAG,2BAAY,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;4BACtD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;4BAC1B,GAAG,GAAG,IAAI,CAAC;yBACd;qBACJ;aACJ;SACJ;QAED,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAC5D,CAAC;IAED,IAAI,MAAM;QAEN,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;IACzC,CAAC;IAEM,GAAG,CAAC,GAAc;QAErB,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAEM,MAAM;QAET,OAAO,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;CACJ;AAlGD,gCAkGC"}
|
|
@@ -12,7 +12,7 @@ class PythonParser {
|
|
|
12
12
|
while (index < input.length) {
|
|
13
13
|
const currentInput = input.slice(index);
|
|
14
14
|
if (currentInput.length === 0) {
|
|
15
|
-
return;
|
|
15
|
+
return; // End of input
|
|
16
16
|
}
|
|
17
17
|
let matched = false;
|
|
18
18
|
for (const { regex, type } of PythonParser.tokenSpecs) {
|
|
@@ -23,8 +23,9 @@ class PythonParser {
|
|
|
23
23
|
if (tokenMatch.length > 1) {
|
|
24
24
|
value = tokenMatch[tokenMatch.length - 1];
|
|
25
25
|
}
|
|
26
|
-
index += tokenMatch[0].length;
|
|
27
|
-
if (type !== PythonTokenType_1.PythonTokenType.UNKNOWN)
|
|
26
|
+
index += tokenMatch[0].length; // Move past this token
|
|
27
|
+
if (type !== PythonTokenType_1.PythonTokenType.UNKNOWN) // WHITESPACE is UNKNOWN and not yielded
|
|
28
|
+
{
|
|
28
29
|
yield { type, value };
|
|
29
30
|
}
|
|
30
31
|
break;
|
|
@@ -133,6 +134,6 @@ PythonParser.tokenSpecs = [
|
|
|
133
134
|
{ regex: /^r"([^"\n]*?)"/, type: PythonTokenType_1.PythonTokenType.RAW_STRING },
|
|
134
135
|
{ regex: /^-?\d+\.?\d*[eE][-+]?\d+/, type: PythonTokenType_1.PythonTokenType.FLOAT },
|
|
135
136
|
{ regex: /^\d+(_\d+)*\b/, type: PythonTokenType_1.PythonTokenType.INTEGER },
|
|
136
|
-
{ regex: /^[^\s:{},"'\[\]\(\)]+/, type: PythonTokenType_1.PythonTokenType.UNKNOWN }
|
|
137
|
+
{ regex: /^[^\s:{},"'\[\]\(\)]+/, type: PythonTokenType_1.PythonTokenType.UNKNOWN } // Catch all for other non-structured sequences
|
|
137
138
|
];
|
|
138
139
|
//# sourceMappingURL=PythonParser.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PythonParser.js","sourceRoot":"","sources":["../../../../lib/classes/python/PythonParser.ts"],"names":[],"mappings":";;;AAAA,uDAAoD;AAEpD,2CAAwC;AACxC,iEAA8D;AAE9D,6CAA0C;AAC1C,+CAA4C;AAQ5C,MAAa,YAAY;IAuCb,MAAM,CAAA,CAAE,QAAQ,CAAC,KAAa;QAElC,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,OAAO,KAAK,GAAG,KAAK,CAAC,MAAM,EAC3B;YACI,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAExC,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAC7B;gBACI,OAAO;
|
|
1
|
+
{"version":3,"file":"PythonParser.js","sourceRoot":"","sources":["../../../../lib/classes/python/PythonParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -108,6 +108,14 @@ double-quoted string"""
|
|
|
108
108
|
assert.equal(parsed.get('string_double'), 'double-quoted \\" string');
|
|
109
109
|
assert.equal(parsed.get('string_triple_single'), 'triple-quoted\'\nsingle-quoted string');
|
|
110
110
|
assert.equal(parsed.get('string_triple_double'), 'triple-quoted\"\ndouble-quoted string');
|
|
111
|
+
/*
|
|
112
|
+
raw_string_single": r'raw single-quoted\ string',
|
|
113
|
+
"raw_string_double": r"raw double-quoted\ string",
|
|
114
|
+
"raw_string_triple_single": r'''raw triple\''-quoted
|
|
115
|
+
single-quoted string''',
|
|
116
|
+
"raw_string_triple_double": r"""raw triple\''-quoted
|
|
117
|
+
double-quoted string"""
|
|
118
|
+
*/
|
|
111
119
|
assert.equal(parsed.get('raw_string_single'), 'raw single-quoted\\ string');
|
|
112
120
|
assert.equal(parsed.get('raw_string_double'), 'raw double-quoted\\ string');
|
|
113
121
|
assert.equal(parsed.get('raw_string_triple_single'), 'raw triple\\\'\'-quoted\nsingle-quoted string');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PythonParser.spec.js","sourceRoot":"","sources":["../../../../lib/classes/python/PythonParser.spec.ts"],"names":[],"mappings":";;AAAA,iDAA8C;AAE9C,iCAAiC;AACjC,6CAA0C;AAC1C,6CAA0C;AAC1C,+CAA4C;AAE5C,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAE1B,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE;QAEnB,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;YAEtD,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2B9B,CAAC;YACS,MAAM,MAAM,GAAG,2BAAY,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YAC/C,IAAI,CAAC,CAAC,MAAM,YAAY,uBAAU,CAAC,EACnC;gBACI,MAAM,CAAC,KAAK,CAAC,CAAC;gBACd,OAAO;aACV;YAED,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YACzC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;YAClB,IAAI,CAAC,CAAC,MAAM,YAAY,uBAAU,CAAC,EACnC;gBACI,MAAM,CAAC,KAAK,CAAC,CAAC;aACjB;iBAED;gBACI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC;gBAC3C,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBAChC,IAAI,CAAC,CAAC,IAAI,YAAY,uBAAU,CAAC,EACjC;oBACI,MAAM,CAAC,KAAK,CAAC,CAAC;iBACjB;qBAED;oBACI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,aAAa,CAAC,CAAC;iBACtD;aACJ;YAED,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAChC,IAAI,CAAC,CAAC,IAAI,YAAY,uBAAU,CAAC,EACjC;gBACI,MAAM,CAAC,KAAK,CAAC,CAAC;aACjB;iBAED;gBACI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;gBAC7B,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC7B,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC7B,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC7B,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBAC/B,IAAI,CAAC,CAAC,UAAU,YAAY,uBAAU,CAAC,EACvC;oBACI,MAAM,CAAC,KAAK,CAAC,CAAC;iBACjB;qBAED;oBACI,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;oBACnC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;iBACtC;gBACD,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;aACxC;YAED,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,CAAC;YAC1C,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAClC,IAAI,CAAC,CAAC,KAAK,YAAY,yBAAW,CAAC,EACnC;gBACI,MAAM,CAAC,KAAK,CAAC,CAAC;aACjB;iBAED;gBACI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC9B,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC9B,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACjC,IAAI,CAAC,CAAC,WAAW,YAAY,yBAAW,CAAC,EACzC;oBACI,MAAM,CAAC,KAAK,CAAC,CAAC;iBACjB;qBAED;oBACI,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;oBACjD,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;iBACvC;gBACD,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;aACzC;YACD,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAChC,IAAI,GAAG,YAAY,MAAM,EACzB;gBACI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;aAChE;iBAED;gBACI,MAAM,CAAC,KAAK,CAAC,CAAC;aACjB;YACD,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC;YACxC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;YACxC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC;YAC3C,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,CAAC;YAC7C,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,0BAA0B,CAAC,CAAC;YACtE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,0BAA0B,CAAC,CAAC;YACtE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,sBAAsB,CAAC,EAAE,uCAAuC,CAAC,CAAC;YAC1F,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,sBAAsB,CAAC,EAAE,uCAAuC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"PythonParser.spec.js","sourceRoot":"","sources":["../../../../lib/classes/python/PythonParser.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,7 @@ class PythonSet extends PythonObject_1.PythonObject {
|
|
|
20
20
|
case PythonTokenType_1.PythonTokenType.BRACE_END:
|
|
21
21
|
{
|
|
22
22
|
if (container.index === startIndex) {
|
|
23
|
+
// Empty braces, this is an empty PythonDict
|
|
23
24
|
return new PythonDict_1.PythonDict();
|
|
24
25
|
}
|
|
25
26
|
else {
|
|
@@ -38,6 +39,7 @@ class PythonSet extends PythonObject_1.PythonObject {
|
|
|
38
39
|
}
|
|
39
40
|
case PythonTokenType_1.PythonTokenType.COLON:
|
|
40
41
|
{
|
|
42
|
+
// This is a dictionary, not a set, start again..
|
|
41
43
|
container.index = startIndex;
|
|
42
44
|
return PythonDict_1.PythonDict.parse(container);
|
|
43
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PythonSet.js","sourceRoot":"","sources":["../../../../lib/classes/python/PythonSet.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AACpD,6CAA0C;AAC1C,iDAA8C;AAE9C,iDAA8C;AAE9C,MAAa,SAAU,SAAQ,2BAAY;IAA3C;;QAEW,SAAI,GAAG,IAAI,GAAG,EAAc,CAAC;IA4DxC,CAAC;IA1DU,MAAM,CAAC,KAAK,CAAC,SAA+B;QAE/C,IAAI,cAAc,GAAG,KAAK,CAAC;QAC3B,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC;QACnC,MAAM,GAAG,GAAG,IAAI,SAAS,EAAE,CAAC;QAC5B,GACA;YACI,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAChD,QAAQ,KAAK,CAAC,IAAI,EAClB;gBACI,KAAK,iCAAe,CAAC,SAAS;oBAC9B;wBACI,IAAI,SAAS,CAAC,KAAK,KAAK,UAAU,EAClC;
|
|
1
|
+
{"version":3,"file":"PythonSet.js","sourceRoot":"","sources":["../../../../lib/classes/python/PythonSet.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AACpD,6CAA0C;AAC1C,iDAA8C;AAE9C,iDAA8C;AAE9C,MAAa,SAAU,SAAQ,2BAAY;IAA3C;;QAEW,SAAI,GAAG,IAAI,GAAG,EAAc,CAAC;IA4DxC,CAAC;IA1DU,MAAM,CAAC,KAAK,CAAC,SAA+B;QAE/C,IAAI,cAAc,GAAG,KAAK,CAAC;QAC3B,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC;QACnC,MAAM,GAAG,GAAG,IAAI,SAAS,EAAE,CAAC;QAC5B,GACA;YACI,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAChD,QAAQ,KAAK,CAAC,IAAI,EAClB;gBACI,KAAK,iCAAe,CAAC,SAAS;oBAC9B;wBACI,IAAI,SAAS,CAAC,KAAK,KAAK,UAAU,EAClC;4BACI,4CAA4C;4BAC5C,OAAO,IAAI,uBAAU,EAAE,CAAC;yBAC3B;6BAED;4BACI,SAAS,CAAC,KAAK,EAAE,CAAC;4BAClB,OAAO,GAAG,CAAC;yBACd;qBACJ;gBACD,KAAK,iCAAe,CAAC,KAAK;oBAC1B;wBACI,IAAI,CAAC,cAAc,EACnB;4BACI,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;yBAC/C;wBACD,cAAc,GAAG,KAAK,CAAC;wBACvB,SAAS,CAAC,KAAK,EAAE,CAAC;wBAClB,MAAM;qBACT;gBACD,KAAK,iCAAe,CAAC,KAAK;oBAC1B;wBACI,iDAAiD;wBACjD,SAAS,CAAC,KAAK,GAAG,UAAU,CAAC;wBAC7B,OAAO,uBAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;qBACtC;gBACD;oBACA;wBACI,IAAI,cAAc,EAClB;4BACI,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAA;yBACtC;wBACD,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,2BAAY,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC;wBACtD,cAAc,GAAG,IAAI,CAAC;qBACzB;aACJ;SACJ,QACM,SAAS,CAAC,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE;QAClD,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;IAClD,CAAC;IAEM,MAAM;QAET,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;CACJ;AA9DD,8BA8DC"}
|
|
@@ -20,6 +20,6 @@ var PythonTokenType;
|
|
|
20
20
|
PythonTokenType[PythonTokenType["TUPLE_END"] = 14] = "TUPLE_END";
|
|
21
21
|
PythonTokenType[PythonTokenType["HEX"] = 15] = "HEX";
|
|
22
22
|
PythonTokenType[PythonTokenType["OCTAL"] = 16] = "OCTAL";
|
|
23
|
-
PythonTokenType[PythonTokenType["UNKNOWN"] = 17] = "UNKNOWN";
|
|
24
|
-
})(PythonTokenType
|
|
23
|
+
PythonTokenType[PythonTokenType["UNKNOWN"] = 17] = "UNKNOWN"; // Catch all for other sequences
|
|
24
|
+
})(PythonTokenType || (exports.PythonTokenType = PythonTokenType = {}));
|
|
25
25
|
//# sourceMappingURL=PythonTokenType.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PythonTokenType.js","sourceRoot":"","sources":["../../../../lib/classes/python/PythonTokenType.ts"],"names":[],"mappings":";;;AAAA,IAAY,eAoBX;AApBD,WAAY,eAAe;IAEvB,qDAAI,CAAA;IACJ,mEAAW,CAAA;IACX,+DAAS,CAAA;IACT,uDAAK,CAAA;IACL,uDAAK,CAAA;IACL,2DAAO,CAAA;IACP,2DAAO,CAAA;IACP,uDAAK,CAAA;IACL,yDAAM,CAAA;IACN,uEAAa,CAAA;IACb,kEAAU,CAAA;IACV,kEAAU,CAAA;IACV,8DAAQ,CAAA;IACR,oEAAW,CAAA;IACX,gEAAS,CAAA;IACT,oDAAG,CAAA;IACH,wDAAK,CAAA;IACL,4DAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"PythonTokenType.js","sourceRoot":"","sources":["../../../../lib/classes/python/PythonTokenType.ts"],"names":[],"mappings":";;;AAAA,IAAY,eAoBX;AApBD,WAAY,eAAe;IAEvB,qDAAI,CAAA;IACJ,mEAAW,CAAA;IACX,+DAAS,CAAA;IACT,uDAAK,CAAA;IACL,uDAAK,CAAA;IACL,2DAAO,CAAA;IACP,2DAAO,CAAA;IACP,uDAAK,CAAA;IACL,yDAAM,CAAA;IACN,uEAAa,CAAA;IACb,kEAAU,CAAA;IACV,kEAAU,CAAA;IACV,8DAAQ,CAAA;IACR,oEAAW,CAAA;IACX,gEAAS,CAAA;IACT,oDAAG,CAAA;IACH,wDAAK,CAAA;IACL,4DAAO,CAAA,CAAC,gCAAgC;AAC5C,CAAC,EApBW,eAAe,+BAAf,eAAe,QAoB1B"}
|