X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fshared%2Fxdynrec.pas;h=968e8b6abc39c857159ea07d807a3048e58bb38e;hb=7f678ccb6d789d35b562f0d51ed39607ff65d040;hp=a5f3623823add801a86fba14851c813d5de0c2d0;hpb=44064f0bd866747dd89f2db87ff8026e5a653a17;p=d2df-sdl.git diff --git a/src/shared/xdynrec.pas b/src/shared/xdynrec.pas index a5f3623..968e8b6 100644 --- a/src/shared/xdynrec.pas +++ b/src/shared/xdynrec.pas @@ -36,7 +36,7 @@ type // 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 @@ -56,23 +56,26 @@ type mIVal2: Integer; // for point and size mSVal: AnsiString; // string; for byte and char arrays mRVal: TDynRecordArray; // for list - mRecRef: TDynRecord; // for record - mMaxDim: Integer; // for byte and char arrays; <0: not an array + 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 mSepPosSize: Boolean; // for points and sizes, use separate fields mAsT: Boolean; // for points and sizes, use separate fields, names starts with `t` mDefined: Boolean; mHasDefault: Boolean; - mDefaultValueSet: Boolean; mOmitDef: Boolean; mInternal: Boolean; mNegBool: Boolean; mBitSetUnique: Boolean; // bitset can contain only one value // default value - mDefSVal: AnsiString; + mDefUnparsed: AnsiString; + mDefSVal: AnsiString; // default string value + mDefIVal, mDefIVal2: Integer; // default integer values + 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; @@ -82,7 +85,8 @@ type procedure parseDef (pr: TTextParser); - procedure fixDefaultValue (); + procedure parseDefaultValue (); // parse `mDefUnparsed` to `mDefSVal`, `mDefIVal`, `mDefIVal2`, `mDefRecRef` + procedure fixDefaultValue (); // this will NOT clone `mDefRecRef` function isDefaultValue (): Boolean; public @@ -96,31 +100,34 @@ type function clone (): TDynField; - procedure parseValue (pr: TTextParser; curheader: TDynRecord); + procedure parseValue (pr: TTextParser); procedure parseBinValue (st: TStream); procedure writeTo (wr: TTextWriter); - procedure writeBinTo (st: TStream; curheader: TDynRecord); + procedure writeBinTo (st: TStream); // won't work for lists function isSimpleEqu (fld: TDynField): Boolean; + procedure setValue (const s: AnsiString); + public property pasname: AnsiString read mPasName; property name: AnsiString read mName; property baseType: TType read mType; property defined: Boolean read mDefined write mDefined; property internal: Boolean read mInternal write mInternal; - //property ival: Integer read mIVal write setIVal; - //property sval: AnsiString read mSVal write setSVal; - property list: TDynRecordArray read mRVal write mRVal; + property ival: Integer read mIVal; + property sval: AnsiString read mSVal; + //property list: TDynRecordArray read mRVal write mRVal; property maxdim: Integer read mMaxDim; // for fixed-size arrays property binOfs: Integer read mBinOfs; // offset in binary; <0 - none property recOfs: Integer read mRecOfs; // offset in record; <0 - none property hasDefault: Boolean read mHasDefault; - property defsval: AnsiString read mDefSVal write mDefSVal; - property ebstype: TEBS read mEBS write mEBS; - property ebstypename: AnsiString read mEBSTypeName write mEBSTypeName; // enum/bitset name + property defsval: AnsiString read mDefSVal; + property ebs: TEBS read mEBS; + property ebstype: TObject read mEBSType; + property ebstypename: AnsiString read mEBSTypeName; // enum/bitset name property x: Integer read mIVal; property w: Integer read mIVal; @@ -141,6 +148,7 @@ type mTrigTypes: array of AnsiString; // if this is triggerdata, we'll hold list of triggers here mHeader: Boolean; // true for header record mBinBlock: Integer; // -1: none + mHeaderRec: TDynRecord; // for "value" records this is header record with data, for "type" records this is header type record private procedure parseDef (pr: TTextParser); // parse definition @@ -152,6 +160,11 @@ type function getIsTrigData (): Boolean; inline; function getIsForTrig (const aname: AnsiString): Boolean; inline; + protected + function findRecordByTypeId (const atypename, aid: AnsiString): TDynRecord; + function findRecordNumByType (const atypename: AnsiString; rc: TDynRecord): Integer; + procedure addRecordByType (const atypename: AnsiString; rc: TDynRecord); + public constructor Create (); constructor Create (pr: TTextParser); // parse definition @@ -161,11 +174,13 @@ type function clone (): TDynRecord; - procedure parseValue (pr: TTextParser; curheader: TDynRecord); + function isSimpleEqu (rec: TDynRecord): Boolean; + + procedure parseValue (pr: TTextParser; beginEaten: Boolean=false); procedure parseBinValue (st: TStream); procedure writeTo (wr: TTextWriter; putHeader: Boolean=true); - procedure writeBinTo (st: TStream; curheader: TDynRecord; trigbufsz: Integer=-1); + procedure writeBinTo (st: TStream; trigbufsz: Integer=-1); public property id: AnsiString read mId; // for map parser @@ -214,11 +229,6 @@ type TDynMapDef = class - private - procedure addRecordByType (const atypename: AnsiString; rc: TDynRecord; curheader: TDynRecord); - function findRecordByTypeId (const atypename, aid: AnsiString; curheader: TDynRecord): TDynRecord; - function findRecordNumByType (const atypename: AnsiString; rc: TDynRecord; curheader: TDynRecord): Integer; - public recTypes: array of TDynRecord; // [0] is always header trigTypes: array of TDynRecord; // trigdata @@ -298,13 +308,17 @@ begin mDefined := false; mOmitDef := false; mInternal := true; + mDefUnparsed := ''; mDefSVal := ''; + mDefIVal := 0; + mDefIVal2 := 0; + mDefRecRef := nil; mEBS := TEBS.TNone; mEBSTypeName := ''; + mEBSType := nil; mBitSetUnique := false; mNegBool := false; mDefId := ''; - mDefaultValueSet := false; end; @@ -332,13 +346,17 @@ begin 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.mDefIVal2 := mDefIVal2; + result.mDefRecRef := mDefRecRef; result.mEBS := mEBS; result.mEBSTypeName := mEBSTypeName; - result.mBitSetUnique := mBitSetUnique; - result.mNegBool := mNegBool; + result.mEBSType := mEBSType; result.mDefId := mDefId; - result.mDefaultValueSet := mDefaultValueSet; end; @@ -361,75 +379,114 @@ begin 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; -procedure TDynField.fixDefaultValue (); +procedure TDynField.setValue (const s: AnsiString); var stp: TTextParser; - s: AnsiString; begin - if not mDefined then + stp := TStrTextParser.Create(s+';'); + try + parseValue(stp); + finally + stp.Free(); + end; +end; + + +procedure TDynField.parseDefaultValue (); +var + stp: TTextParser = nil; + oSVal: AnsiString; + oIVal, oIVal2: Integer; + oRRef: TDynRecord; + oDef: Boolean; +begin + if not mHasDefault then begin - if not mHasDefault then - begin - if mInternal then exit; - raise Exception.Create(Format('field ''%s'' in record ''%s'' of record type ''%s'' is not set', [mName, mOwner.mId, mOwner.mName])); - end; - if (mEBS = TEBS.TRec) then - begin - if (CompareText(mDefSVal, 'null') <> 0) then raise Exception.Create(Format('field ''%s'' in record ''%s'' of record type ''%s'' has non-null default value ''%s''', [mName, mOwner.mId, mOwner.mName, mDefSVal])); - mDefined := true; - assert(mRecRef = nil); - mDefaultValueSet := true; - exit; - end; - s := ''; - case mType of - TType.TChar, TType.TString: s := TTextParser.quote(mDefSVal)+';'; - TType.TPoint, TType.TSize: assert(false); // no default values for these types yet - else s := mDefSVal+';'; - end; - //mDefined := true; - //writeln('DEFAULT for <', mName, '>: <', s, '>'); - stp := TStrTextParser.Create(s); + mDefSVal := ''; + mDefIVal := 0; + mDefIVal2 := 0; + mDefRecRef := nil; + end + else + begin + oSVal := mSVal; + oIVal := mIVal; + oIVal2 := mIVal2; + oRRef := mRecRef; + oDef := mDefined; try - parseValue(stp, nil); + stp := TStrTextParser.Create(mDefUnparsed+';'); + parseValue(stp); + mDefSVal := mSVal; + mDefIVal := mIVal; + mDefIVal2 := mIVal2; + mDefRecRef := mRecRef; finally + mSVal := oSVal; + mIVal := oIVal; + mIVal2 := oIVal2; + mRecRef := oRRef; + mDefined := oDef; stp.Free(); end; - assert(mDefined); - mDefaultValueSet := true; end; end; +// default value should be parsed +procedure TDynField.fixDefaultValue (); +begin + if mDefined then exit; + if not mHasDefault then + begin + if mInternal then exit; + raise Exception.Create(Format('field ''%s'' in record ''%s'' of record type ''%s'' is not set', [mName, mOwner.mId, mOwner.mName])); + end; + if (mEBS = TEBS.TRec) then + begin + mRecRef := mDefRecRef; + { + if (mDefRecRef <> nil) then + begin + rec := mDefRecRef.clone(); + rec.mHeaderRec := mOwner.mHeaderRec; + try + mOwner.addRecordByType(mEBSTypeName, rec); + mRecRef := rec; + rec := nil; + finally + rec.Free(); + end; + end; + } + end; + mSVal := mDefSVal; + mIVal := mDefIVal; + mIVal2 := mDefIVal2; + mDefined := true; +end; + + +// default value should be parsed function TDynField.isDefaultValue (): Boolean; -var - fld: TDynField = nil; - stp: TTextParser = nil; - s: AnsiString; begin if not mHasDefault then begin result := false; exit; end; - //result := mDefaultValueSet; - if (mEBS = TEBS.TRec) then begin result := (mRecRef = nil); exit; end; - s := ''; + if (mEBS = TEBS.TRec) then begin result := (mRecRef = mDefRecRef); exit; end; case mType of - TType.TChar, TType.TString: s := TTextParser.quote(mDefSVal)+';'; - TType.TPoint, TType.TSize: begin result := false; exit; end; // no default values for these types yet - else s := mDefSVal+';'; - end; - stp := TStrTextParser.Create(s); - try - fld := clone(); - fld.parseValue(stp, nil); - result := isSimpleEqu(fld); - finally - fld.Free(); - stp.Free(); + TType.TChar, TType.TString: result := (mSVal = mDefSVal); + TType.TPoint, TType.TSize: result := (mIVal = mDefIVal2) and (mIVal2 = mDefIVal2); + TType.TList, TType.TTrigData: result := false; // no default values for those types + else result := (mIVal = mDefIVal); end; end; @@ -457,7 +514,7 @@ end; function TDynField.definition (): AnsiString; begin - result := mPasName+' is '+TTextParser.quote(mName)+' type '; + result := mPasName+' is '+quoteStr(mName)+' type '; result += getTypeName(mType); if (mMaxDim >= 0) then result += Format('[%d]', [mMaxDim]); if (mRecOfs >= 0) then result += Format(' offset %d', [mRecOfs]); @@ -467,25 +524,7 @@ begin TEBS.TEnum: result += ' enum '+mEBSTypeName; TEBS.TBitSet: begin result += ' bitset '; if mBitSetUnique then result += 'unique '; result += mEBSTypeName; end; end; - if mHasDefault then - begin - if (mType = TType.TChar) or (mType = TType.TString) then result += ' default '+TTextParser.quote(mDefSVal) - else if (Length(mDefSVal) > 0) then result += ' default '+mDefSVal; - { - else - begin - if (mType = TType.TBool) then - begin - result += ' default '; - if (mDefIVal <> 0) then result += 'true' else result += 'false'; - end - else - begin - result += Format(' default %d', [mDefIVal]); - end; - end; - } - end; + if mHasDefault and (Length(mDefUnparsed) > 0) then result += ' default '+mDefUnparsed; if mSepPosSize then begin if (mType = TType.TPoint) then begin if (mAsT) then result += ' as txy' else result += ' as xy'; end @@ -546,7 +585,7 @@ begin 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; @@ -650,19 +689,18 @@ begin else if (fldtype = 'trigdata') then mType := TType.TTrigData else raise Exception.Create(Format('field ''%s'' has invalid type ''%s''', [fldname, fldtype])); - {if hasdefId and (self.baseType = self.TType.TBool) then + 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 (defstr = 'true') or (defstr = 'tan') or (defstr = 'yes') then self.mDefIVal := 1 - else if (defstr = 'false') or (defstr = 'ona') or (defstr = 'no') then self.mDefIVal := 0 - else raise Exception.Create(Format('field ''%s'' has invalid boolean default ''%s''', [fldname, defstr])); - end - else} - begin - if hasdefStr then self.mDefSVal := defstr - else if hasdefInt then self.mDefSVal := Format('%d', [defint]) - else if hasdefId then self.mDefSVal := defstr; + 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.mHasDefault := (hasdefStr or hasdefId or hasdefInt); self.mPasName := fldpasname; self.mEBS := lebs; @@ -678,7 +716,7 @@ begin end; -procedure TDynField.writeBinTo (st: TStream; curheader: TDynRecord); +procedure TDynField.writeBinTo (st: TStream); var s: AnsiString; f: Integer; @@ -690,20 +728,14 @@ begin TEBS.TNone: begin end; TEBS.TRec: begin - // this must be byte/word/int 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 @@ -711,7 +743,7 @@ begin if (mRecRef <> nil) then begin ws := TSFSMemoryChunkStream.Create(buf, mMaxDim); - mRecRef.writeBinTo(ws, curheader, mMaxDim); // as trigdata + mRecRef.writeBinTo(ws, mMaxDim); // as trigdata end; st.WriteBuffer(buf^, mMaxDim); finally @@ -720,6 +752,7 @@ begin end; exit; end; + // record reference if (mRecRef = nil) then begin // no ref, write -1 @@ -741,7 +774,7 @@ begin else raise Exception.Create(Format('record reference type ''%s'' in field ''%s'' cannot be written', [mEBSTypeName, mName])); end; // find record number - f := mOwner.mOwner.findRecordNumByType(mEBSTypeName, mRecRef, curheader); + f := mOwner.findRecordNumByType(mEBSTypeName, mRecRef); if (f < 0) then raise Exception.Create(Format('record reference type ''%s'' in field ''%s'' not found in record list', [mEBSTypeName, mName])); if (f > maxv) then raise Exception.Create(Format('record reference type ''%s'' in field ''%s'' has too big index', [mEBSTypeName, mName])); case mType of @@ -774,9 +807,7 @@ begin else begin if (Length(mSVal) > mMaxDim) then raise Exception.Create(Format('invalid string size definition for field ''%s''', [mName])); - //FillChar(s[0], sizeof(s), 0); - s := utfTo1251(mSVal); - //writeln('writing char[', mMaxDim, '] <', mName, '>: ', TTextParser.quote(s)); + s := utf2win(mSVal); if (Length(s) > 0) then st.WriteBuffer(PChar(s)^, Length(s)); for f := Length(s) to mMaxDim do writeInt(st, Byte(0)); end; @@ -785,30 +816,22 @@ begin TType.TByte, TType.TUByte: begin - // either array, and this should be triggerdata, or byte - if (mMaxDim < 0) then - begin - // byte - writeInt(st, Byte(mIVal)); - end - else - begin - // array - raise Exception.Create(Format('byte array in field ''%s'' cannot be written', [mName])); - end; + // triggerdata array was processed earlier + if (mMaxDim >= 0) then Exception.Create(Format('byte array in field ''%s'' cannot be written', [mName])); + writeInt(st, Byte(mIVal)); exit; end; TType.TShort, TType.TUShort: begin - if (mMaxDim > 0) then raise Exception.Create(Format('short array in field ''%s'' cannot be written', [mName])); + if (mMaxDim >= 0) then raise Exception.Create(Format('short array in field ''%s'' cannot be written', [mName])); writeInt(st, Word(mIVal)); exit; end; TType.TInt, TType.TUInt: begin - if (mMaxDim > 0) then raise Exception.Create(Format('int array in field ''%s'' cannot be written', [mName])); + if (mMaxDim >= 0) then raise Exception.Create(Format('int array in field ''%s'' cannot be written', [mName])); writeInt(st, LongWord(mIVal)); exit; end; @@ -819,7 +842,7 @@ begin TType.TPoint, TType.TSize: begin - if (mMaxDim > 0) then raise Exception.Create(Format('pos/size array in field ''%s'' cannot be written', [mName])); + if (mMaxDim >= 0) then raise Exception.Create(Format('pos/size array in field ''%s'' cannot be written', [mName])); writeInt(st, Word(mIVal)); writeInt(st, Word(mIVal2)); exit; @@ -841,21 +864,19 @@ end; 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 @@ -870,9 +891,11 @@ 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 @@ -886,9 +909,11 @@ begin 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 @@ -940,7 +965,7 @@ begin TType.TChar: begin if (mMaxDim = 0) then raise Exception.Create(Format('invalid string size definition for field ''%s''', [mName])); - wr.put(TTextParser.quote(mSVal)); + wr.put(quoteStr(mSVal)); wr.put(';'#10); exit; end; @@ -956,7 +981,7 @@ begin end; TType.TString: begin - wr.put(TTextParser.quote(mSVal)); + wr.put(quoteStr(mSVal)); wr.put(';'#10); exit; end; @@ -982,7 +1007,7 @@ begin end; -procedure TDynField.parseValue (pr: TTextParser; curheader: TDynRecord); +procedure TDynField.parseValue (pr: TTextParser); procedure parseInt (min, max: Integer); begin @@ -993,7 +1018,6 @@ procedure TDynField.parseValue (pr: TTextParser; curheader: TDynRecord); var rec, rc: TDynRecord; - def: TDynMapDef; es: TDynEBS = nil; tfld: TDynField; tk: AnsiString; @@ -1003,43 +1027,65 @@ begin TEBS.TNone: begin end; TEBS.TRec: begin - def := mOwner.mOwner; // 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 := def.findTrigFor(tfld.mSVal); - 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.parseValue(pr, curheader); - 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 if (pr.tokType = pr.TTId) then begin - rec := def.findRecordByTypeId(mEBSTypeName, pr.tokStr, curheader); - if (rec = nil) then raise Exception.Create(Format('record ''%s'' (%s) value for field ''%s'' not found', [pr.tokStr, mEBSTypeName, mName])); - pr.expectId(); - mRecRef := rec; + if pr.eatId('null') then + begin + mRecRef := nil; + end + else + begin + rec := mOwner.findRecordByTypeId(mEBSTypeName, pr.tokStr); + if (rec = nil) then raise Exception.Create(Format('record ''%s'' (%s) value for field ''%s'' not found', [pr.tokStr, mEBSTypeName, mName])); + pr.expectId(); + mRecRef := rec; + end; mDefined := true; pr.expectTT(pr.TTSemi); exit; end else if (pr.tokType = pr.TTBegin) then begin - rec := def.findRecType(mEBSTypeName); + //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.parseValue(pr, curheader); + rc.mHeaderRec := mOwner.mHeaderRec; + rc.parseValue(pr); mRecRef := rc; mDefined := true; - mOwner.mOwner.addRecordByType(mEBSTypeName, rc, curheader); + mOwner.addRecordByType(mEBSTypeName, rc); pr.eatTT(pr.TTSemi); // hack: allow (but don't require) semicolon after inline records exit; end; @@ -1047,9 +1093,10 @@ 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])); + //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]; @@ -1061,9 +1108,10 @@ begin 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])); + //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 @@ -1214,6 +1262,7 @@ begin mFields := nil; mTrigTypes := nil; mHeader := false; + mHeaderRec := nil; mBinBlock := -1; parseDef(pr); end; @@ -1226,6 +1275,7 @@ begin mFields := nil; mTrigTypes := nil; mHeader := false; + mHeaderRec := nil; end; @@ -1234,6 +1284,7 @@ begin mName := ''; mFields := nil; mTrigTypes := nil; + mHeaderRec := nil; inherited; end; @@ -1291,8 +1342,6 @@ begin result.mPasName := mPasName; result.mName := mName; result.mSize := mSize; - result.mHeader := mHeader; - result.mBinBlock := mBinBlock; SetLength(result.mFields, Length(mFields)); for f := 0 to High(mFields) do begin @@ -1301,6 +1350,85 @@ 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; + + +function TDynRecord.findRecordByTypeId (const atypename, aid: AnsiString): TDynRecord; +var + fld: TDynField; + f: Integer; +begin + result := nil; + if (Length(aid) = 0) then exit; + // find record data + fld := mHeaderRec.field[atypename]; + if (fld = nil) then exit; + if (fld.mType <> fld.TType.TList) then raise Exception.Create(Format('cannot get record of type ''%s'' due to name conflict with ordinary field', [atypename])); + // find by id + for f := 0 to High(fld.mRVal) do + begin + if (CompareText(fld.mRVal[f].mId, aid) = 0) then begin result := fld.mRVal[f]; exit; end; + end; + // alas +end; + + +function TDynRecord.findRecordNumByType (const atypename: AnsiString; rc: TDynRecord): Integer; +var + fld: TDynField; + f: Integer; +begin + result := -1; + // find record data + fld := mHeaderRec.field[atypename]; + if (fld = nil) then exit; + if (fld.mType <> fld.TType.TList) then raise Exception.Create(Format('cannot get record of type ''%s'' due to name conflict with ordinary field', [atypename])); + // find by ref + for f := 0 to High(fld.mRVal) do + begin + if (fld.mRVal[f] = rc) then begin result := f; exit; end; + end; + // alas +end; + + +procedure TDynRecord.addRecordByType (const atypename: AnsiString; rc: TDynRecord); +var + fld: TDynField; +begin + // find record data + fld := mHeaderRec.field[atypename]; + if (fld = nil) then + begin + // first record + fld := TDynField.Create(atypename, TDynField.TType.TList); + fld.mOwner := mHeaderRec; + SetLength(mHeaderRec.mFields, Length(mHeaderRec.mFields)+1); + mHeaderRec.mFields[High(mHeaderRec.mFields)] := fld; + end; + if (fld.mType <> fld.TType.TList) then raise Exception.Create(Format('cannot append record of type ''%s'' due to name conflict with ordinary field', [atypename])); + // append + SetLength(fld.mRVal, Length(fld.mRVal)+1); + fld.mRVal[High(fld.mRVal)] := rc; +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; @@ -1330,6 +1458,7 @@ begin SetLength(mTrigTypes, 1); mTrigTypes[0] := tdn; end; + mName := 'TriggerData'; end else begin @@ -1400,7 +1529,7 @@ begin else begin // record - result := mPasName+' is '+TTextParser.quote(mName); + result := mPasName+' is '+quoteStr(mName); if (mSize >= 0) then result += Format(' size %d bytes', [mSize]); if mHeader then result += ' header'; end; @@ -1415,7 +1544,7 @@ begin end; -procedure TDynRecord.writeBinTo (st: TStream; curheader: TDynRecord; trigbufsz: Integer=-1); +procedure TDynRecord.writeBinTo (st: TStream; trigbufsz: Integer=-1); var fld: TDynField; rec: TDynRecord; @@ -1424,8 +1553,8 @@ var blk, blkmax: Integer; f, c: Integer; bufsz: Integer = 0; + blksz: Integer; begin - if (curheader = nil) and mHeader then curheader := self; if (trigbufsz < 0) then begin if (mBinBlock < 1) then raise Exception.Create('cannot write binary record without block number'); @@ -1451,8 +1580,8 @@ begin if (fld.mBinOfs < 0) then continue; if (fld.mBinOfs >= bufsz) then raise Exception.Create('binary value offset is outside of the buffer'); TSFSMemoryChunkStream(ws).setup(buf+fld.mBinOfs, bufsz-fld.mBinOfs); - writeln('writing field <', fld.mName, '>'); - fld.writeBinTo(ws, curheader); + //writeln('writing field <', fld.mName, '>'); + fld.writeBinTo(ws); end; // write block with normal fields @@ -1505,17 +1634,18 @@ begin if (rec.mBinBlock <> blk) then continue; if (ws = nil) then ws := TMemoryStream.Create(); //rec.writeBinTo(ws); - for c := 0 to High(fld.mRVal) do fld.mRVal[c].writeBinTo(ws, curheader); + for c := 0 to High(fld.mRVal) do fld.mRVal[c].writeBinTo(ws); end; end; // flush block if (ws <> nil) then begin + blksz := Integer(ws.position); ws.position := 0; writeInt(st, Byte(blk)); // type writeInt(st, LongWord(0)); // reserved - writeInt(st, LongWord(ws.size)); // size - st.CopyFrom(ws, ws.size); + writeInt(st, LongWord(blksz)); // size + st.CopyFrom(ws, blksz); ws.Free(); ws := nil; end; @@ -1551,6 +1681,7 @@ begin if not mHeader then raise Exception.Create('record list in non-header record'); for c := 0 to High(fld.mRVal) do begin + if (Length(fld.mRVal[c].mId) = 0) then continue; wr.putIndent(); fld.mRVal[c].writeTo(wr, true); end; @@ -1569,40 +1700,44 @@ begin end; -procedure TDynRecord.parseValue (pr: TTextParser; curheader: TDynRecord); +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])); // not a header? - if (curheader <> self) then + 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 + assert(mHeaderRec = self); end; - writeln('parsing record <', mName, '>'); - pr.expectTT(pr.TTBegin); + //writeln('parsing record <', mName, '>'); + 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 (curheader = self) then + if mHeader then begin // add records with this type (if any) trc := mOwner.findRecType(pr.tokStr); if (trc <> nil) then begin rec := trc.clone(); + rec.mHeaderRec := mHeaderRec; try pr.skipToken(); - rec.parseValue(pr, curheader); + rec.parseValue(pr); if (Length(rec.mId) > 0) then begin fld := field[pr.tokStr]; @@ -1614,7 +1749,7 @@ begin end; end; end; - mOwner.addRecordByType(rec.mName, rec, curheader); + addRecordByType(rec.mName, rec); rec := nil; finally rec.Free(); @@ -1630,7 +1765,7 @@ begin if fld.defined then raise Exception.Create(Format('duplicate field ''%s'' in record ''%s''', [fld.mName, mName])); if fld.internal then raise Exception.Create(Format('internal field ''%s'' in record ''%s''', [fld.mName, mName])); pr.skipToken(); - fld.parseValue(pr, curheader); + fld.parseValue(pr); continue; end; @@ -1640,7 +1775,7 @@ begin pr.expectTT(pr.TTEnd); // fix field defaults for f := 0 to High(mFields) do mFields[f].fixDefaultValue(); - writeln('done parsing record <', mName, '>'); + //writeln('done parsing record <', mName, '>'); end; @@ -1876,98 +2011,53 @@ begin end; -function TDynMapDef.findRecordByTypeId (const atypename, aid: AnsiString; curheader: TDynRecord): TDynRecord; +procedure TDynMapDef.parseDef (pr: TTextParser); var - rec: TDynRecord; + rec, hdr: TDynRecord; + eb: TDynEBS; fld: TDynField; f: Integer; -begin - result := nil; - // find record type - if (curheader = nil) then exit; - //writeln('searching for type <', atypename, '>'); - rec := findRecType(atypename); - if (rec = nil) then exit; - // find record data - //writeln('searching for data of type <', atypename, '>'); - fld := curheader.field[atypename]; - if (fld = nil) then exit; - if (fld.mType <> fld.TType.TList) then exit; - // find by id - //writeln('searching for data of type <', atypename, '> with id <', aid, '> (', Length(fld.mRVal), ')'); - for f := 0 to High(fld.mRVal) do + + // setup header links and type links + procedure linkRecord (rec: TDynRecord); + var + f: Integer; begin - if (CompareText(fld.mRVal[f].mId, aid) = 0) then + rec.mHeaderRec := recTypes[0]; + for f := 0 to High(rec.mFields) do begin - //writeln(' FOUND!'); - result := fld.mRVal[f]; - exit; + 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; - // alas -end; - -procedure TDynMapDef.addRecordByType (const atypename: AnsiString; rc: TDynRecord; curheader: TDynRecord); -var - rec: TDynRecord; - fld: TDynField; -begin - assert(curheader <> nil); - // find record type - rec := findRecType(atypename); - assert(rec <> nil); - // find record data - //writeln('searching for data of type <', atypename, '>'); - fld := curheader.field[atypename]; - if (fld = nil) then + // setup default values + procedure fixRecordDefaults (rec: TDynRecord); + var + f: Integer; begin - // first record - fld := TDynField.Create(atypename, TDynField.TType.TList); - fld.mOwner := curheader; - SetLength(curheader.mFields, Length(curheader.mFields)+1); - curheader.mFields[High(curheader.mFields)] := fld; - end; - if (fld.mType <> fld.TType.TList) then exit; - // add - SetLength(fld.mRVal, Length(fld.mRVal)+1); - fld.mRVal[High(fld.mRVal)] := rc; -end; - - -function TDynMapDef.findRecordNumByType (const atypename: AnsiString; rc: TDynRecord; curheader: TDynRecord): Integer; -var - rec: TDynRecord; - fld: TDynField; - f: Integer; -begin - result := -1; - if (curheader = nil) then exit; - // find record type - rec := findRecType(atypename); - if (rec = nil) then exit; - // find record data - fld := curheader.field[atypename]; - if (fld = nil) then exit; - if (fld.mType <> fld.TType.TList) then exit; - // find by ref - for f := 0 to High(fld.mRVal) do - begin - if (fld.mRVal[f] = rc) then + for f := 0 to High(rec.mFields) do begin - result := f; - exit; + fld := rec.mFields[f]; + if fld.mHasDefault then fld.parseDefaultValue(); end; end; - // alas -end; - -procedure TDynMapDef.parseDef (pr: TTextParser); -var - dr, hdr: TDynRecord; - eb: TDynEBS; - f: Integer; begin hdr := nil; while true do @@ -1992,43 +2082,52 @@ begin 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; + // put header record to top if (hdr = nil) then raise Exception.Create('header definition not found in mapdef'); SetLength(recTypes, Length(recTypes)+1); for f := High(recTypes) downto 1 do recTypes[f] := recTypes[f-1]; recTypes[0] := hdr; + + // 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 fixRecordDefaults(recTypes[f]); + for f := 0 to High(trigTypes) do fixRecordDefaults(trigTypes[f]); end; @@ -2041,7 +2140,8 @@ begin try pr.expectId(headerType.name); res := headerType.clone(); - res.parseValue(pr, res); + res.mHeaderRec := res; + res.parseValue(pr); result := res; res := nil; except on E: Exception do