summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c0312ba)
raw | patch | inline | side by side (parent: c0312ba)
| author | Ketmar Dark <ketmar@ketmar.no-ip.org> | |
| Sun, 27 Aug 2017 10:42:12 +0000 (13:42 +0300) | ||
| committer | Ketmar Dark <ketmar@ketmar.no-ip.org> | |
| Sun, 27 Aug 2017 14:43:53 +0000 (17:43 +0300) |
| src/shared/mapdef.txt | patch | blob | history | |
| src/shared/xdynrec.pas | patch | blob | history |
diff --git a/src/shared/mapdef.txt b/src/shared/mapdef.txt
index ed949e46c3f798daf426417ad0c990e9fbed631b..f9145c312b1e5d6bab5d20ddf436f5234381f660 100644 (file)
--- a/src/shared/mapdef.txt
+++ b/src/shared/mapdef.txt
TriggerType is "type" type ubyte offset 17 enum TriggerType;
ActivateType is "activatetype" type ubyte offset 18 bitset ActivateType;
Keys is "keys" type ubyte offset 19 bitset Key default KEY_NONE omitdefault;
- DATA is "triggerdata" type byte[128] offset 20 triggerdata; // the only special nested structure
+ DATA is "triggerdata" type trigdata[128] offset 20; // the only special nested structure
// not in binary
//Id is "id" type string default "" omitdefault;
// internals
TriggerData for TRIGGER_TELEPORT {
TargetPoint is "target" type point offset 0;
- d2d_teleport is "d2d" type bool offset 8;
- silent_teleport is "silent" type bool offset 9;
- TlpDir is "direction" type ubyte offset 10 enum DirType;
+ d2d_teleport is "d2d" type bool offset 8 default false omitdefault;
+ silent_teleport is "silent" type bool offset 9 default false omitdefault;
+ TlpDir is "direction" type ubyte offset 10 enum DirType default DIR_LEFT omitdefault;
}
TriggerData for (TRIGGER_OPENDOOR, TRIGGER_CLOSEDOOR, TRIGGER_DOOR, TRIGGER_DOOR5, TRIGGER_CLOSETRAP, TRIGGER_TRAP, TRIGGER_LIFTUP, TRIGGER_LIFTDOWN, TRIGGER_LIFT) {
PanelID is "panelid" type int offset 0 panel;
- NoSound is "silent" type bool offset 4;
- d2d_doors is "d2d" type bool offset 5;
+ NoSound is "silent" type bool offset 4 default false omitdefault;
+ d2d_doors is "d2d" type bool offset 5 default false omitdefault;
}
TriggerData for (TRIGGER_PRESS, TRIGGER_ON, TRIGGER_OFF, TRIGGER_ONOFF) {
diff --git a/src/shared/xdynrec.pas b/src/shared/xdynrec.pas
index 2aec726e03ac8180a26f30715edba488f6399732..968e8b6abc39c857159ea07d807a3048e58bb38e 100644 (file)
--- a/src/shared/xdynrec.pas
+++ b/src/shared/xdynrec.pas
// TPoint: pair of Shorts
// TSize: pair of UShorts
// TList: actually, array of records
- // TTrigData: array of bytes
+ // TTrigData: array of mMaxDim bytes, but internally a record (mRecRef)
// arrays of chars are pascal shortstrings (with counter in the first byte)
type
mIVal2: Integer; // for point and size
mSVal: AnsiString; // string; for byte and char arrays
mRVal: TDynRecordArray; // for list
- mRecRef: TDynRecord; // for record
+ mRecRef: TDynRecord; // for TEBS.TRec
mMaxDim: Integer; // for byte and char arrays; <0: not an array; 0: impossible value
mBinOfs: Integer; // offset in binary; <0 - none
mRecOfs: Integer; // offset in record; <0 - none
mDefRecRef: TDynRecord;
mEBS: TEBS; // complex type type
mEBSTypeName: AnsiString; // name of enum, bitset or record
+ mEBSType: TObject; // either TDynRecord or TDynEBS; nil means "simple type"; nil for `TTrigData` too
// temp
mDefId: AnsiString;
property recOfs: Integer read mRecOfs; // offset in record; <0 - none
property hasDefault: Boolean read mHasDefault;
property defsval: AnsiString read mDefSVal;
- property ebstype: TEBS read mEBS;
+ property ebs: TEBS read mEBS;
+ property ebstype: TObject read mEBSType;
property ebstypename: AnsiString read mEBSTypeName; // enum/bitset name
property x: Integer read mIVal;
function clone (): TDynRecord;
- procedure parseValue (pr: TTextParser);
+ function isSimpleEqu (rec: TDynRecord): Boolean;
+
+ procedure parseValue (pr: TTextParser; beginEaten: Boolean=false);
procedure parseBinValue (st: TStream);
procedure writeTo (wr: TTextWriter; putHeader: Boolean=true);
mDefRecRef := nil;
mEBS := TEBS.TNone;
mEBSTypeName := '';
+ mEBSType := nil;
mBitSetUnique := false;
mNegBool := false;
mDefId := '';
result.mHasDefault := mHasDefault;
result.mOmitDef := mOmitDef;
result.mInternal := mInternal;
+ result.mNegBool := mNegBool;
+ result.mBitSetUnique := mBitSetUnique;
result.mDefUnparsed := mDefUnparsed;
result.mDefSVal := mDefSVal;
result.mDefIVal := mDefIVal;
result.mDefRecRef := mDefRecRef;
result.mEBS := mEBS;
result.mEBSTypeName := mEBSTypeName;
- result.mBitSetUnique := mBitSetUnique;
- result.mNegBool := mNegBool;
+ result.mEBSType := mEBSType;
result.mDefId := mDefId;
end;
TType.TSize:
result := ((mIVal = fld.mIVal) and (mIVal2 = fld.mIVal2));
TType.TList: result := false;
- TType.TTrigData: result := false;
+ TType.TTrigData:
+ begin
+ if (mRecRef = nil) then begin result := (fld.mRecRef = nil); exit; end;
+ result := mRecRef.isSimpleEqu(fld.mRecRef);
+ end;
else raise Exception.Create('ketmar forgot to handle some field type');
end;
end;
if pr.eatDelim('[') then
begin
lmaxdim := pr.expectInt();
- if (lmaxdim < 1) then raise Exception.Create(Format('invali field ''%s'' array size', [fldname]));
+ if (lmaxdim < 1) then raise Exception.Create(Format('invalid field ''%s'' array size', [fldname]));
pr.expectDelim(']');
end;
else if (fldtype = 'trigdata') then mType := TType.TTrigData
else raise Exception.Create(Format('field ''%s'' has invalid type ''%s''', [fldname, fldtype]));
+ if (lmaxdim > 0) and (mType <> TType.TChar) and (mType <> TType.TTrigData) then raise Exception.Create(Format('field ''%s'' of type ''%s'' cannot be array', [fldname, fldtype]));
+ if (mType = TType.TTrigData) then
+ begin
+ if (lmaxdim < 1) then raise Exception.Create(Format('field ''%s'' of type ''%s'' cannot be array', [fldname, fldtype]));
+ if (Length(fldrecname) > 0) then raise Exception.Create(Format('field ''%s'' of type ''%s'' cannot have another type', [fldname, fldtype]));
+ lebs := TDynField.TEBS.TRec;
+ end;
+
if hasdefStr then self.mDefUnparsed := quoteStr(defstr)
else if hasdefInt then self.mDefUnparsed := Format('%d', [defint])
else if hasdefId then self.mDefUnparsed := defstr;
self.mAsT := ast;
self.mOmitDef := omitdef;
self.mInternal := ainternal;
-
- //if mHasDefault then parseDefaultValue();
end;
if (mMaxDim >= 0) then
begin
// this must be triggerdata
- if (CompareText(mEBSTypeName, 'triggerdata') <> 0) then
+ if (mType <> TType.TTrigData) then
begin
raise Exception.Create(Format('record reference type ''%s'' in field ''%s'' cannot be written', [mEBSTypeName, mName]));
end;
// write triggerdata
- case mType of
- TType.TChar, TType.TByte, TType.TUByte: begin end;
- else raise Exception.Create(Format('record reference type ''%s'' in field ''%s'' cannot be written', [mEBSTypeName, mName]));
- end;
- //writeln('trigdata size: ', mMaxDim);
GetMem(buf, mMaxDim);
if (buf = nil) then raise Exception.Create(Format('record reference type ''%s'' in field ''%s'' cannot be written', [mEBSTypeName, mName]));
try
end;
exit;
end;
+ // record reference
if (mRecRef = nil) then
begin
// no ref, write -1
procedure TDynField.writeTo (wr: TTextWriter);
var
- def: TDynMapDef;
es: TDynEBS = nil;
f, mask: Integer;
first, found: Boolean;
begin
wr.put(mName);
wr.put(' ');
- // if this field should contain struct, convert type and parse struct
case mEBS of
TEBS.TNone: begin end;
TEBS.TRec:
begin
if (mRecRef = nil) then
begin
- wr.put('null;'#10);
+ if (mType = TType.TTrigData) then wr.put('{}'#10) else wr.put('null;'#10);
end
else if (Length(mRecRef.mId) = 0) then
begin
end;
TEBS.TEnum:
begin
- def := mOwner.mOwner;
- es := def.findEBSType(mEBSTypeName);
- if (es = nil) then raise Exception.Create(Format('record enum type ''%s'' for field ''%s'' not found', [mEBSTypeName, mName]));
+ //def := mOwner.mOwner;
+ //es := def.findEBSType(mEBSTypeName);
+ es := nil;
+ if (mEBSType <> nil) and (mEBSType is TDynEBS) then es := (mEBSType as TDynEBS);
+ if (es = nil) or (not es.mIsEnum) then raise Exception.Create(Format('record enum type ''%s'' for field ''%s'' not found', [mEBSTypeName, mName]));
for f := 0 to High(es.mVals) do
begin
if (es.mVals[f] = mIVal) then
end;
TEBS.TBitSet:
begin
- def := mOwner.mOwner;
- es := def.findEBSType(mEBSTypeName);
- if (es = nil) then raise Exception.Create(Format('record bitset type ''%s'' for field ''%s'' not found', [mEBSTypeName, mName]));
+ //def := mOwner.mOwner;
+ //es := def.findEBSType(mEBSTypeName);
+ es := nil;
+ if (mEBSType <> nil) and (mEBSType is TDynEBS) then es := (mEBSType as TDynEBS);
+ if (es = nil) or es.mIsEnum then raise Exception.Create(Format('record bitset type ''%s'' for field ''%s'' not found', [mEBSTypeName, mName]));
// none?
if (mIVal = 0) then
begin
TEBS.TRec:
begin
// ugly hack. sorry.
- if (CompareText(mEBSTypeName, 'triggerdata') = 0) then
+ if (mType = TType.TTrigData) then
begin
- rec := mOwner;
- // find trigger definition
- tfld := rec.field['type'];
- if (tfld = nil) then raise Exception.Create(Format('triggerdata value for field ''%s'' in record ''%s'' without ''type'' field', [mName, rec.mName]));
- if (tfld.mEBS <> TEBS.TEnum) then raise Exception.Create(Format('triggerdata value for field ''%s'' in record ''%s'' with bad ''type'' field', [mName, rec.mName]));
- rc := mOwner.mOwner.findTrigFor(tfld.mSVal); // find in mapdef
- if (rc = nil) then raise Exception.Create(Format('triggerdata definition for field ''%s'' in record ''%s'' with type ''%s'' not found', [mName, rec.mName, tfld.mSVal]));
- rc := rc.clone();
- rc.mHeaderRec := mOwner.mHeaderRec;
- rc.parseValue(pr);
- mRecRef := rc;
+ pr.expectTT(pr.TTBegin);
+ if (pr.tokType = pr.TTEnd) then
+ begin
+ // '{}'
+ mRecRef := nil;
+ pr.expectTT(pr.TTEnd);
+ end
+ else
+ begin
+ rec := mOwner;
+ // find trigger definition
+ tfld := rec.field['type'];
+ if (tfld = nil) then raise Exception.Create(Format('triggerdata value for field ''%s'' in record ''%s'' without ''type'' field', [mName, rec.mName]));
+ if (tfld.mEBS <> TEBS.TEnum) then raise Exception.Create(Format('triggerdata value for field ''%s'' in record ''%s'' with bad ''type'' field', [mName, rec.mName]));
+ rc := mOwner.mOwner.findTrigFor(tfld.mSVal); // find in mapdef
+ if (rc = nil) then raise Exception.Create(Format('triggerdata definition for field ''%s'' in record ''%s'' with type ''%s'' not found', [mName, rec.mName, tfld.mSVal]));
+ rc := rc.clone();
+ rc.mHeaderRec := mOwner.mHeaderRec;
+ //writeln(rc.definition);
+ rc.parseValue(pr, true);
+ mRecRef := rc;
+ end;
mDefined := true;
+ pr.eatTT(pr.TTSemi); // hack: allow (but don't require) semicolon after inline records
exit;
end;
// other record types
end
else if (pr.tokType = pr.TTBegin) then
begin
- rec := mOwner.mOwner.findRecType(mEBSTypeName); // find in mapdef
+ //rec := mOwner.mOwner.findRecType(mEBSTypeName); // find in mapdef
+ rec := nil;
+ if (mEBSType <> nil) and (mEBSType is TDynRecord) then rec := (mEBSType as TDynRecord);
if (rec = nil) then raise Exception.Create(Format('record type ''%s'' for field ''%s'' not found', [mEBSTypeName, mName]));
rc := rec.clone();
rc.mHeaderRec := mOwner.mHeaderRec;
end;
TEBS.TEnum:
begin
- es := mOwner.mOwner.findEBSType(mEBSTypeName); // find in mapdef
- if (es = nil) then raise Exception.Create(Format('record enum type ''%s'' for field ''%s'' not found', [mEBSTypeName, mName]));
+ //es := mOwner.mOwner.findEBSType(mEBSTypeName); // find in mapdef
+ es := nil;
+ if (mEBSType <> nil) and (mEBSType is TDynEBS) then es := (mEBSType as TDynEBS);
+ if (es = nil) or (not es.mIsEnum) then raise Exception.Create(Format('record enum type ''%s'' for field ''%s'' not found', [mEBSTypeName, mName]));
tk := pr.expectId();
if not es.has[tk] then raise Exception.Create(Format('record enum value ''%s'' of type ''%s'' for field ''%s'' not found', [tk, mEBSTypeName, mName]));
mIVal := es.field[tk];
end;
TEBS.TBitSet:
begin
- es := mOwner.mOwner.findEBSType(mEBSTypeName); // find in mapdef
- if (es = nil) then raise Exception.Create(Format('record bitset type ''%s'' for field ''%s'' not found', [mEBSTypeName, mName]));
+ //es := mOwner.mOwner.findEBSType(mEBSTypeName); // find in mapdef
+ es := nil;
+ if (mEBSType <> nil) and (mEBSType is TDynEBS) then es := (mEBSType as TDynEBS);
+ if (es = nil) or es.mIsEnum then raise Exception.Create(Format('record bitset type ''%s'' for field ''%s'' not found', [mEBSTypeName, mName]));
mIVal := 0;
while true do
begin
result.mPasName := mPasName;
result.mName := mName;
result.mSize := mSize;
- result.mHeader := mHeader;
- result.mHeaderRec := mHeaderRec;
- result.mBinBlock := mBinBlock;
SetLength(result.mFields, Length(mFields));
for f := 0 to High(mFields) do
begin
end;
SetLength(result.mTrigTypes, Length(mTrigTypes));
for f := 0 to High(mTrigTypes) do result.mTrigTypes[f] := mTrigTypes[f];
+ result.mHeader := mHeader;
+ result.mBinBlock := mBinBlock;
+ result.mHeaderRec := mHeaderRec;
end;
end;
+function TDynRecord.isSimpleEqu (rec: TDynRecord): Boolean;
+var
+ f: Integer;
+begin
+ if (rec = nil) then begin result := false; exit; end; // self.mRecRef can't be `nil` here
+ if (rec = self) then begin result := true; exit; end;
+ if (Length(mFields) <> Length(rec.mFields)) then begin result := false; exit; end;
+ result := false;
+ for f := 0 to High(mFields) do
+ begin
+ if not mFields[f].isSimpleEqu(rec.mFields[f]) then exit;
+ end;
+ result := true;
+end;
+
+
procedure TDynRecord.parseDef (pr: TTextParser);
var
fld: TDynField;
SetLength(mTrigTypes, 1);
mTrigTypes[0] := tdn;
end;
+ mName := 'TriggerData';
end
else
begin
end;
-procedure TDynRecord.parseValue (pr: TTextParser);
+procedure TDynRecord.parseValue (pr: TTextParser; beginEaten: Boolean=false);
var
f, c: Integer;
fld: TDynField;
rec, trc: TDynRecord;
- //success: Boolean;
begin
if (mOwner = nil) then raise Exception.Create(Format('can''t parse record ''%s'' value without owner', [mName]));
if not mHeader then
begin
// id?
- if (pr.tokType = pr.TTId) then mId := pr.expectId();
+ if (not beginEaten) and (pr.tokType = pr.TTId) then mId := pr.expectId();
end
else
begin
end;
//writeln('parsing record <', mName, '>');
- pr.expectTT(pr.TTBegin);
+ if not beginEaten then pr.expectTT(pr.TTBegin);
while (pr.tokType <> pr.TTEnd) do
begin
if (pr.tokType <> pr.TTId) then raise Exception.Create('identifier expected');
- //writeln('<', pr.tokStr, ':', asheader, '>');
+ //writeln('<', mName, '.', pr.tokStr, '>');
// records
if mHeader then
procedure TDynMapDef.parseDef (pr: TTextParser);
var
- dr, hdr: TDynRecord;
+ rec, hdr: TDynRecord;
eb: TDynEBS;
- f, c: Integer;
+ fld: TDynField;
+ f: Integer;
+
+ // setup header links and type links
+ procedure linkRecord (rec: TDynRecord);
+ var
+ f: Integer;
+ begin
+ rec.mHeaderRec := recTypes[0];
+ for f := 0 to High(rec.mFields) do
+ begin
+ fld := rec.mFields[f];
+ if (fld.mType = fld.TType.TTrigData) then continue;
+ case fld.mEBS of
+ TDynField.TEBS.TNone: begin end;
+ TDynField.TEBS.TRec:
+ begin
+ fld.mEBSType := findRecType(fld.mEBSTypeName);
+ if (fld.mEBSType = nil) then raise Exception.Create(Format('field ''%s'' of type ''%s'' has no correcponding record definition', [fld.mName, fld.mEBSTypeName]));
+ end;
+ TDynField.TEBS.TEnum,
+ TDynField.TEBS.TBitSet:
+ begin
+ fld.mEBSType := findEBSType(fld.mEBSTypeName);
+ if (fld.mEBSType = nil) then raise Exception.Create(Format('field ''%s'' of type ''%s'' has no correcponding enum/bitset', [fld.mName, fld.mEBSTypeName]));
+ if ((fld.mEBS = TDynField.TEBS.TEnum) <> (fld.mEBSType as TDynEBS).mIsEnum) then raise Exception.Create(Format('field ''%s'' of type ''%s'' enum/bitset type conflict', [fld.mName, fld.mEBSTypeName]));
+ end;
+ end;
+ end;
+ end;
+
+ // setup default values
+ procedure fixRecordDefaults (rec: TDynRecord);
+ var
+ f: Integer;
+ begin
+ for f := 0 to High(rec.mFields) do
+ begin
+ fld := rec.mFields[f];
+ if fld.mHasDefault then fld.parseDefaultValue();
+ end;
+ end;
+
begin
hdr := nil;
while true do
if (pr.tokStr = 'TriggerData') then
begin
- dr := TDynRecord.Create(pr);
- for f := 0 to High(dr.mTrigTypes) do
+ rec := TDynRecord.Create(pr);
+ for f := 0 to High(rec.mTrigTypes) do
begin
- if (findTrigFor(dr.mTrigTypes[f]) <> nil) then
+ if (findTrigFor(rec.mTrigTypes[f]) <> nil) then
begin
- dr.Free();
- raise Exception.Create(Format('duplicate trigdata ''%s''', [dr.mTrigTypes[f]]));
+ rec.Free();
+ raise Exception.Create(Format('duplicate trigdata ''%s''', [rec.mTrigTypes[f]]));
end;
end;
- dr.mOwner := self;
+ rec.mOwner := self;
SetLength(trigTypes, Length(trigTypes)+1);
- trigTypes[High(trigTypes)] := dr;
+ trigTypes[High(trigTypes)] := rec;
//writeln(dr.definition); writeln;
continue;
end;
- dr := TDynRecord.Create(pr);
+ rec := TDynRecord.Create(pr);
//writeln(dr.definition); writeln;
- if (findRecType(dr.name) <> nil) then begin dr.Free(); raise Exception.Create(Format('duplicate record ''%s''', [dr.name])); end;
- if (hdr <> nil) and (CompareText(dr.name, hdr.name) = 0) then begin dr.Free(); raise Exception.Create(Format('duplicate record ''%s''', [dr.name])); end;
- dr.mOwner := self;
- if dr.mHeader then
+ if (findRecType(rec.name) <> nil) then begin rec.Free(); raise Exception.Create(Format('duplicate record ''%s''', [rec.name])); end;
+ if (hdr <> nil) and (CompareText(rec.name, hdr.name) = 0) then begin rec.Free(); raise Exception.Create(Format('duplicate record ''%s''', [rec.name])); end;
+ rec.mOwner := self;
+ if rec.mHeader then
begin
- if (hdr <> nil) then begin dr.Free(); raise Exception.Create(Format('duplicate header record ''%s'' (previous is ''%s'')', [dr.name, hdr.name])); end;
- hdr := dr;
+ if (hdr <> nil) then begin rec.Free(); raise Exception.Create(Format('duplicate header record ''%s'' (previous is ''%s'')', [rec.name, hdr.name])); end;
+ hdr := rec;
end
else
begin
SetLength(recTypes, Length(recTypes)+1);
- recTypes[High(recTypes)] := dr;
+ recTypes[High(recTypes)] := rec;
end;
end;
for f := High(recTypes) downto 1 do recTypes[f] := recTypes[f-1];
recTypes[0] := hdr;
- // setup header links
- for f := 0 to High(recTypes) do recTypes[f].mHeaderRec := recTypes[0];
+ // setup header links and type links
+ for f := 0 to High(recTypes) do linkRecord(recTypes[f]);
+ for f := 0 to High(trigTypes) do linkRecord(trigTypes[f]);
// setup default values
- for f := 0 to High(recTypes) do
- begin
- for c := 0 to High(recTypes[f].mFields) do
- begin
- if recTypes[f].mFields[c].mHasDefault then recTypes[f].mFields[c].parseDefaultValue();
- end;
- end;
+ for f := 0 to High(recTypes) do fixRecordDefaults(recTypes[f]);
+ for f := 0 to High(trigTypes) do fixRecordDefaults(trigTypes[f]);
end;