浏览代码

fcl-passrc: simplified

mattias 1 月之前
父节点
当前提交
5c24a474cc
共有 2 个文件被更改,包括 6 次插入4 次删除
  1. 5 3
      packages/fcl-passrc/src/pasresolver.pp
  2. 1 1
      packages/fcl-passrc/src/pparser.pp

+ 5 - 3
packages/fcl-passrc/src/pasresolver.pp

@@ -12217,7 +12217,8 @@ begin
     end;
   PopGenericParamScope(El);
 
-  if El.Name<>'' then begin
+  if El.Name<>'' then
+    begin
     if not (TopScope is TPasIdentifierScope) then
       RaiseInvalidScopeForElement(20190812215622,El);
 
@@ -12228,7 +12229,8 @@ begin
       Scope:=TPasArrayScope(PushScope(El,ScopeClass_Array));
       AddGenericTemplateIdentifiers(TypeParams,Scope);
       end;
-  end else if TypeParams<>nil then
+    end
+  else if TypeParams<>nil then
     RaiseNotYetImplemented(20190812215851,El); // anonymous generic array type
 end;
 
@@ -14629,7 +14631,7 @@ begin
         [],'array values',GetTypeDescription(ResolvedEl),El);
     end
   else
-    SetResolverValueExpr(ResolvedEl,btArrayLit,nil,nil,TArrayValues(El),[rrfReadable]);
+    SetResolverValueExpr(ResolvedEl,btArrayLit,nil,nil,El,[rrfReadable]);
 end;
 
 procedure TPasResolver.ComputeRecordValues(El: TRecordValues; out

+ 1 - 1
packages/fcl-passrc/src/pparser.pp

@@ -3150,9 +3150,9 @@ begin
     else
       begin
       NextToken;
-      // Empty record constant: a: Record .. end = ();
       if (CurToken=tkBraceClose) then
         begin
+        // Empty record constant: a: Record .. end = ();
         Result:=CreateRecordValues(AParent);
         NextToken;
         Exit;