smartinstaller/adm/src/ADMXmlParser.cpp
branchADM
changeset 48 364021cecc90
equal deleted inserted replaced
47:3f419852be07 48:364021cecc90
       
     1 /*
       
     2 * Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
       
     3 * All rights reserved.
       
     4 * This component and the accompanying materials are made available
       
     5 * under the terms of "Eclipse Public License v1.0"
       
     6 * which accompanies this distribution, and is available
       
     7 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
       
     8 *
       
     9 * Initial Contributors:
       
    10 * Nokia Corporation - initial contribution.
       
    11 *
       
    12 * Contributors:
       
    13 *
       
    14 * Description: 
       
    15 *     CXmlParser implementation
       
    16 *
       
    17 *
       
    18 */
       
    19 
       
    20 
       
    21 #include <SenDomFragment.h>
       
    22 #include <SenXmlReader.h>
       
    23 #include <SenElement.h>
       
    24 #include "ADMXmlParser.h"
       
    25 #include "ADMPackageInfo.h"
       
    26 #include "macros.h"
       
    27 #include "config.h"
       
    28 
       
    29 _LIT(KSisExtension,".sis");
       
    30 
       
    31 CXmlParser* CXmlParser::NewLC()
       
    32 	{
       
    33 	CXmlParser* object = new ( ELeave ) CXmlParser();
       
    34 	CleanupStack::PushL( object );
       
    35 	object->ConstructL();
       
    36 	return object;
       
    37 	}
       
    38 
       
    39 CXmlParser* CXmlParser::NewL()
       
    40 	{
       
    41 	CXmlParser* object = CXmlParser::NewLC();
       
    42 	CleanupStack::Pop();
       
    43 	return object;
       
    44 	}
       
    45 
       
    46 CXmlParser::CXmlParser()
       
    47 	:iXmlReader(NULL),
       
    48 	iDomFragment(NULL)
       
    49 	{
       
    50 	}
       
    51 
       
    52 CXmlParser::~CXmlParser()
       
    53 	{
       
    54 	iRfs.Close();
       
    55 
       
    56 	if ( iXmlReader )
       
    57 		{
       
    58 		delete iXmlReader;
       
    59 		iXmlReader = NULL;
       
    60 		}
       
    61 	if ( iDomFragment )
       
    62 		{
       
    63 		delete iDomFragment;
       
    64 		iDomFragment = NULL;
       
    65 		}
       
    66 	}
       
    67 
       
    68 void CXmlParser::ConstructL()
       
    69 	{
       
    70 	User::LeaveIfError(iRfs.Connect());
       
    71 	}
       
    72 
       
    73 void CXmlParser::InitL()
       
    74 	{
       
    75 	// Do the cleanup as this function could be
       
    76 	// called multiple times.
       
    77 	if ( iXmlReader )
       
    78 	   {
       
    79 	   delete iXmlReader;
       
    80 	   iXmlReader = NULL;
       
    81 	   }
       
    82 
       
    83 	if ( iDomFragment )
       
    84 	   {
       
    85 	   delete iDomFragment;
       
    86 	   iDomFragment = NULL;
       
    87 	   }
       
    88 
       
    89 	iXmlReader = CSenXmlReader::NewL(EErrorOnUnrecognisedTags);
       
    90 	iDomFragment = CSenDomFragment::NewL();
       
    91 
       
    92 	iXmlReader->SetContentHandler(*iDomFragment);
       
    93 	iDomFragment->SetReader(*iXmlReader);
       
    94 	}
       
    95 
       
    96 void CXmlParser::GetChangesInfoL(const TDesC& aChangesFileName, CPackageInfo *packageInfo,CDepTree* mainTree)
       
    97 	{
       
    98 	InitL();
       
    99 
       
   100 	iXmlReader->ParseL(iRfs, aChangesFileName);
       
   101 
       
   102 	// Get package uid
       
   103 	// Leave if package uid not present
       
   104 	CSenElement* packageElement;
       
   105 	packageElement = iDomFragment->AsElement().Element(KFieldDepPackageUid);
       
   106 	if (packageElement == NULL)
       
   107 		{
       
   108 		User::Leave(EMissingPackageUid);
       
   109 		}
       
   110 	TPtrC8 packageUidPtr = packageElement->Content();
       
   111 	TUint32 packageUid=0;
       
   112 	if (StringToInt(packageUidPtr,packageUid) != KErrNone)
       
   113 		{
       
   114 		User::Leave(EInvalidPackageUid);
       
   115 		}
       
   116 
       
   117 	//Check whether the packageId received in changes file is same as the one already stored in the packageinfo from dependency info.
       
   118 	//If there is mismatch, exit. If it matches, proceed further.
       
   119 	if(packageUid != packageInfo->iPackageUid)
       
   120 		{
       
   121 		User::Leave(EIncorrectPackageUid);
       
   122 		}
       
   123 
       
   124 	packageElement = iDomFragment->AsElement().Element(KFieldDepPackageName);
       
   125 	if (packageElement)
       
   126 		{
       
   127 		DELETE_IF_NONNULL( packageInfo->iPackageName );
       
   128 		packageInfo->iPackageName = packageElement->ContentUnicodeL();
       
   129 		}
       
   130 	else
       
   131 		{
       
   132 		User::Leave(EMissingPackageName);
       
   133 		}
       
   134 
       
   135 	// Get dependent package vendor
       
   136 	packageElement = iDomFragment->AsElement().Element(KFieldDepVendor);
       
   137 	if (packageElement)
       
   138 		{
       
   139 		DELETE_IF_NONNULL( packageInfo->iVendor );
       
   140 		packageInfo->iVendor = packageElement->ContentUnicodeL();
       
   141 		}
       
   142 	else
       
   143 		{
       
   144 		User::Leave(EMissingVendorName);
       
   145 		}
       
   146 
       
   147 	// Get Priority for the drive
       
   148 	//This is optional.Hence no Leave for Missing Priority.
       
   149 	//Default is 0.
       
   150 	packageElement = iDomFragment->AsElement().Element(KFieldDrivePriority);
       
   151 	if(packageElement)
       
   152 		{
       
   153 		TPtrC8 drivePtr = packageElement->Content();
       
   154 		if (StringToInt(drivePtr,packageInfo->iDrivePriority) != KErrNone)
       
   155 			{
       
   156 			User::Leave(EInvalidDrivePriority);
       
   157 			}
       
   158 		}
       
   159 
       
   160 	// Get the mandatory drive.
       
   161 	//This is optional.Hence no Leave for Missing info.
       
   162 	//Default is none.
       
   163 	packageElement = iDomFragment->AsElement().Element(KFieldMandatoryInstallDrive);
       
   164 	if(packageElement)
       
   165 		{
       
   166 		packageInfo->iMandatoryInstallDrive = packageElement->ContentUnicodeL()->Des()[0];
       
   167 		}
       
   168 
       
   169 	GetVersionInfoL(packageInfo,mainTree->GetMachineId());
       
   170 	}
       
   171 
       
   172 void CXmlParser::GetVersionInfoL(CPackageInfo *packageInfo,TUint32 machineId)
       
   173 	{
       
   174 	RPointerArray<CSenElement> versionInfo;
       
   175 	CleanupClosePushL(versionInfo);
       
   176 
       
   177 	iDomFragment->AsElement().ElementsL(versionInfo,KFieldVersionInformation);
       
   178 	const TInt versionInfoCount(versionInfo.Count());
       
   179 	TVersion latestVersion(0,0,0);
       
   180 	TInt latestVersionCount = -1;
       
   181 	CSenElement* packageElement;
       
   182 
       
   183 	//Changes file will contain different versions of the package along
       
   184 	//with the list of supporrted devices for that perticular version.
       
   185 
       
   186 	//If no version was specified in the dep file, then the latest should be read.
       
   187 	//While reading the latest, it should be confirmed whether the same supports the given device.
       
   188 
       
   189 	for (TInt i=0; i<versionInfoCount; ++i)
       
   190 		{
       
   191 		packageElement = versionInfo[i]->Element(KFieldDepPackageVersion);
       
   192 		if (packageElement == NULL)
       
   193 			{
       
   194 			User::Leave(EMissingDepVersion);
       
   195 			}
       
   196 
       
   197 		TPtrC8 versionPtr = packageElement->Content();
       
   198 		TVersion ver;
       
   199 		if (SetVersion(versionPtr, ver) == EFalse)
       
   200 			{
       
   201 			User::Leave(EInvalidVersion);
       
   202 			}
       
   203 
       
   204 		//Check whether the MachineID of this device is supported for this corresponding version in the changes file.
       
   205 		if(checkMachineIdL(versionInfo[i],machineId))
       
   206 			{
       
   207 			if((CompareVersions(packageInfo->iVersion,ver) == EEqualVersion)||(CompareVersions(packageInfo->iVersion,ver) == EGreaterSecondVersion))
       
   208 				{
       
   209 				//Version specified in the dep file of parent matches the version in the changes file which inturn matches to the MachineID. :)
       
   210 				//Or there exists a greater version in changes file.
       
   211 				latestVersion = ver;
       
   212 				latestVersionCount = i;
       
   213 				}
       
   214 			}
       
   215 		}//end of for loop
       
   216 
       
   217 	if(latestVersionCount == -1)
       
   218 		{
       
   219 		//No matching Machine IDs at all for any version specified in the changes file.
       
   220 		User::Leave(EUnsupportedDevice);
       
   221 		}
       
   222 	else
       
   223 		{
       
   224 		packageInfo->iVersion = latestVersion;
       
   225 		}
       
   226 
       
   227 	// Get dependent package URL
       
   228 	packageElement= versionInfo[latestVersionCount]->Element(KFieldDepUrl);
       
   229 	if (packageElement)
       
   230 		{
       
   231 		DELETE_IF_NONNULL( packageInfo->iUrl );
       
   232 		TPtrC8 urlPtr = packageElement->Content();
       
   233 
       
   234 		HBufC8* url = urlPtr.AllocL();
       
   235 
       
   236 		packageInfo->iUrl = url;
       
   237 		}
       
   238 	else
       
   239 		{
       
   240 		User::Leave(EMissingPackageUrl);
       
   241 		}
       
   242 
       
   243 
       
   244 	packageElement = versionInfo[latestVersionCount]->Element(KFieldDepFileName);
       
   245 	if (packageElement)
       
   246 		{
       
   247 		DELETE_IF_NONNULL( packageInfo->iDepFileName );
       
   248 		packageInfo->iDepFileName = packageElement->ContentUnicodeL();
       
   249 		}
       
   250 	else
       
   251 		{
       
   252 		User::Leave(EMissingDepFileName);
       
   253 		}
       
   254 
       
   255 	packageElement = versionInfo[latestVersionCount]->Element(KFieldInstallPackageName);
       
   256 	if (packageElement)
       
   257 		{
       
   258 		DELETE_IF_NONNULL( packageInfo->iSisPackageName );
       
   259 		packageInfo->iSisPackageName = packageElement->ContentUnicodeL();
       
   260 		}
       
   261 	else
       
   262 		{
       
   263 		User::Leave(EMissingSisFileName);
       
   264 		}
       
   265 
       
   266 	packageElement = versionInfo[latestVersionCount]->Element(KFieldDateOfSubmission);
       
   267 	if (packageElement)
       
   268 		{
       
   269 		DELETE_IF_NONNULL( packageInfo->iDateOfSubmission );
       
   270 		packageInfo->iDateOfSubmission = packageElement->ContentUnicodeL();
       
   271 		}
       
   272 	else
       
   273 		{
       
   274 		User::Leave(EMissingSubmissionDate);
       
   275 		}
       
   276 	//TODO: There needs to be a separate function to convert the Date format into a string format.
       
   277 	//Call that function here.
       
   278 	packageElement = versionInfo[latestVersionCount]->Element(KFieldDateOfModification);
       
   279 	if (packageElement)
       
   280 		{
       
   281 		DELETE_IF_NONNULL( packageInfo->iDateOfModification );
       
   282 		packageInfo->iDateOfModification = packageElement->ContentUnicodeL();
       
   283 		}
       
   284 	else
       
   285 		{
       
   286 		User::Leave(EMissingModificationDate);
       
   287 		}
       
   288 
       
   289 	packageElement = versionInfo[latestVersionCount]->Element(KFieldDownloadSize);
       
   290 	TPtrC8 downloadSizePtr = packageElement->Content();
       
   291 	TUint32 downloadSize=0;
       
   292 	if (StringToInt(downloadSizePtr,downloadSize) != KErrNone)
       
   293 		{
       
   294 		User::Leave(EInvalidPackageUid);
       
   295 		}
       
   296 	if(downloadSize)
       
   297 		{
       
   298 		packageInfo->iDownloadSize = downloadSize;
       
   299 		}
       
   300 	else
       
   301 		{
       
   302 		User::Leave(EMissingDownloadSize);
       
   303 		}
       
   304 
       
   305 	packageElement = versionInfo[latestVersionCount]->Element(KFieldInstalledSize);
       
   306 	TPtrC8 installedSizePtr = packageElement->Content();
       
   307 	TUint32 installedSize=0;
       
   308 	if (StringToInt(installedSizePtr,installedSize) != KErrNone)
       
   309 		{
       
   310 		User::Leave(EInvalidPackageUid);
       
   311 		}
       
   312 	if(installedSize)
       
   313 		{
       
   314 		packageInfo->iInstalledSize = installedSize;
       
   315 		}
       
   316 	else
       
   317 		{
       
   318 		User::Leave(EMissingInstalledSize);
       
   319 		}
       
   320 	CleanupStack::PopAndDestroy(&versionInfo);
       
   321 }
       
   322 
       
   323 TBool CXmlParser::checkMachineIdL(CSenElement *versionInfo, TUint32 machineId)
       
   324 	{
       
   325 	RPointerArray<CSenElement> deviceInfo;
       
   326 	CleanupClosePushL(deviceInfo);
       
   327 
       
   328 	versionInfo->ElementsL(deviceInfo,KFieldSupportedDevice);
       
   329 	const TInt deviceInfoCount(deviceInfo.Count());
       
   330 
       
   331 	CSenElement* packageElement;
       
   332 
       
   333 	// See if the device is supported by this
       
   334 	// particular version, by comparing the list
       
   335 	// of machine ids supported by the version
       
   336 	// with the machine id of device. .
       
   337 	for(TInt i=0;i<deviceInfoCount;i++)
       
   338 		{
       
   339 		packageElement = deviceInfo[i]->Element(KFieldDeviceMachineId);
       
   340 
       
   341 		if (packageElement == NULL)
       
   342 			{
       
   343 			User::Leave(EMissingMachineID);
       
   344 			}
       
   345 		TPtrC8 packageUidPtr = packageElement->Content();
       
   346 		TUint32 changesMachineId = 0;
       
   347 		if (StringToInt(packageUidPtr,changesMachineId) != KErrNone)
       
   348 			{
       
   349 			User::Leave(EInvalidMachineID);
       
   350 			}
       
   351 		if(changesMachineId == machineId)
       
   352 			{
       
   353 			CleanupStack::PopAndDestroy(&deviceInfo);
       
   354 			return ETrue;
       
   355 			}
       
   356 		}
       
   357 	CleanupStack::PopAndDestroy(&deviceInfo);
       
   358 	return EFalse;
       
   359 	}
       
   360 
       
   361 CPackageInfo* CXmlParser::GetDepContentsL(const TDesC& aDepFileName, CPackageInfo *packageInfo, CDepTree* aMainTree)
       
   362 	{
       
   363 	InitL();
       
   364 
       
   365 	iXmlReader->ParseL(iRfs, aDepFileName);
       
   366 
       
   367 	// Get package uid
       
   368 	// Leave if package uid not present
       
   369 	CSenElement* packageElement;
       
   370 	packageElement = iDomFragment->AsElement().Element(KFieldPackageUid);
       
   371 	if (packageElement == NULL)
       
   372 		{
       
   373 		User::Leave(EMissingPackageUid);
       
   374 		}
       
   375 	TPtrC8 packageUidPtr = packageElement->Content();
       
   376 	TUint32 packageUid=0;
       
   377 	if (StringToInt(packageUidPtr,packageUid) != KErrNone)
       
   378 		{
       
   379 		User::Leave(EInvalidPackageUid);
       
   380 		}
       
   381 
       
   382 	User::LeaveIfNull(aMainTree);
       
   383 	if(aMainTree->IsDepTreeEmpty())
       
   384 		{
       
   385 		// Add root package(first package) to the list
       
   386 		packageInfo = CPackageInfo::NewL();
       
   387 		packageInfo->iPackageUid = packageUid;
       
   388 		packageInfo->iPackageStatus = EPackageRootToBeInstalled;
       
   389 		aMainTree->AddPackageInfo(packageInfo);
       
   390 		}
       
   391 	else
       
   392 		{
       
   393 		User::LeaveIfNull(packageInfo);
       
   394 		if(packageInfo->iPackageUid != packageUid)
       
   395 			{
       
   396 			//the package pointer doesn't match the depfile
       
   397 			User::Leave(EInvalidPackageUid);
       
   398 			}
       
   399 		}
       
   400 
       
   401 	// Get Dep version
       
   402 	// Leave if Dep version is not present
       
   403 	packageElement = iDomFragment->AsElement().Element(KFieldDepVersion);
       
   404 	if (packageElement == NULL)
       
   405 		{
       
   406 		User::Leave(EMissingDepVersion);
       
   407 		}
       
   408 	else
       
   409 		{
       
   410 		TPtrC8 versionPtr = packageElement->Content();
       
   411 		TVersion ver;
       
   412 		if (SetVersion(versionPtr, ver) == EFalse)
       
   413 			{
       
   414 			User::Leave(EInvalidVersion);
       
   415 			}
       
   416 		packageInfo->iDepVersion = ver;
       
   417 		}
       
   418 
       
   419 	// Parse the dependencies
       
   420 	SetDependenciesL(packageInfo, aMainTree);
       
   421 
       
   422 	return packageInfo;
       
   423 	}
       
   424 
       
   425 void CXmlParser::SetDependenciesL(CPackageInfo* aPackageInfo, CDepTree* aMainTree)
       
   426 	{
       
   427 	// Get dependencies
       
   428 	RPointerArray<CSenElement> dependency;
       
   429 	CleanupClosePushL(dependency);
       
   430 
       
   431 	iDomFragment->AsElement().ElementsL(dependency,KFieldDependency);
       
   432 	const TInt DependencyCount(dependency.Count());
       
   433 
       
   434 	User::LeaveIfNull(aMainTree);
       
   435 	User::LeaveIfNull(aPackageInfo);
       
   436 
       
   437 
       
   438 	TBool IsNonRootNodeDep = 1;
       
   439 
       
   440 	// Check if the dependencies are of the root node.
       
   441 	// If yes, then clear the flag
       
   442 	if (aMainTree->GetRootNode() == aPackageInfo)
       
   443 		{
       
   444 		IsNonRootNodeDep = 0;
       
   445 		}
       
   446 
       
   447 	for (TInt i=0; i<DependencyCount; ++i)
       
   448 		{
       
   449 		// Get dependency UID
       
   450 		CSenElement* packageElement;
       
   451 		TUint32 depPackageUid = 0;
       
   452 		packageElement = dependency[i]->Element(KFieldDepPackageUid);
       
   453 		if (packageElement == NULL)
       
   454 			{
       
   455 			User::Leave(EMissingPackageUid);
       
   456 			}
       
   457 		TPtrC8 depPackageUidPtr = packageElement->Content();
       
   458 		if ( StringToInt(depPackageUidPtr,depPackageUid) != KErrNone )
       
   459 			{
       
   460 			User::Leave(EInvalidPackageUid);
       
   461 			}
       
   462 
       
   463 		// Check if the dependency already present in the tree.
       
   464 		CPackageInfo* depPackageInfo = aMainTree->LocatePackageInDepTree(depPackageUid);
       
   465 
       
   466 		// If dependency is listed in the tree,
       
   467 		// create a new edge for it
       
   468 		if (depPackageInfo != NULL)
       
   469 			{
       
   470 			aPackageInfo->AddEdgeL(depPackageInfo);
       
   471 			continue;
       
   472 			}
       
   473 
       
   474 		// Dependency is not already present, so create a new node
       
   475 		depPackageInfo = CPackageInfo::NewL();
       
   476 		aMainTree->AddPackageInfo(depPackageInfo);
       
   477 
       
   478 		depPackageInfo->iPackageUid = depPackageUid;
       
   479 		aPackageInfo->AddEdgeL(depPackageInfo);
       
   480 
       
   481 		// Get dependent package name
       
   482 		packageElement = dependency[i]->Element(KFieldDepPackageName);
       
   483 		if (packageElement)
       
   484 			{
       
   485 			depPackageInfo->iPackageName = packageElement->ContentUnicodeL();
       
   486 			}
       
   487 		else if(IsNonRootNodeDep)
       
   488 			{
       
   489 			User::Leave(EMissingPackageName);
       
   490 			}
       
   491 		else
       
   492 			{
       
   493 			depPackageInfo->iPackageName = HBufC::NewL(
       
   494 												depPackageUidPtr.Length() +
       
   495 												KSisExtension().Length());
       
   496 
       
   497 			TPtr depPackageName(depPackageInfo->iPackageName->Des());
       
   498 			depPackageName.Copy(depPackageUidPtr);
       
   499 			depPackageName.Append(KSisExtension);
       
   500 			}
       
   501 
       
   502 
       
   503 		// Get dependent package version
       
   504 		packageElement = dependency[i]->Element(KFieldDepPackageVersion);
       
   505 
       
   506 		if(packageElement)
       
   507 			{
       
   508 			TPtrC8 versionPtr = packageElement->Content();
       
   509 			TVersion ver;
       
   510 			if (SetVersion(versionPtr, ver) == EFalse)
       
   511 				{
       
   512 				User::Leave(EInvalidVersion);
       
   513 				}
       
   514 			depPackageInfo->iVersion = ver;
       
   515 			}
       
   516 		else if(IsNonRootNodeDep)
       
   517 			{
       
   518 			User::Leave(EMissingPackageVersion);
       
   519 			}
       
   520 
       
   521 		// Get dependent package vendor
       
   522 		packageElement = dependency[i]->Element(KFieldDepVendor);
       
   523 		if (packageElement)
       
   524 			{
       
   525 			depPackageInfo->iVendor = packageElement->ContentUnicodeL();
       
   526 			}
       
   527 		else if(IsNonRootNodeDep)
       
   528 			{
       
   529 			User::Leave(EMissingVendorName);
       
   530 			}
       
   531 
       
   532 #ifdef url_support
       
   533 		// Get dependent package URL
       
   534 		packageElement = dependency[i]->Element(KFieldDepUrl);
       
   535 
       
   536 		if (packageElement)
       
   537 			{
       
   538 			TPtrC8 urlPtr = packageElement->Content();
       
   539 			HBufC8* url = urlPtr.AllocL();
       
   540 
       
   541 			TPtr8 urlPtr2 = url->Des();
       
   542 			urlPtr2.Copy(urlPtr);
       
   543 
       
   544 			depPackageInfo->iUrl = url;
       
   545 			}
       
   546 		else if(IsNonRootNodeDep)
       
   547 			{
       
   548 			User::Leave(EMissingPackageUrl);
       
   549 			}
       
   550 #else
       
   551 		// Ignore the Url(if specified) for the root node.
       
   552 		if(IsNonRootNodeDep)
       
   553 			{
       
   554 			// Get dependent package URL
       
   555 			packageElement = dependency[i]->Element(KFieldDepUrl);
       
   556 			if (packageElement)
       
   557 				{
       
   558 				depPackageInfo->iUrl = packageElement->Content().AllocL();
       
   559 				}
       
   560 			else
       
   561 				{
       
   562 				User::Leave(EMissingPackageUrl);
       
   563 				}
       
   564 			}
       
   565 #endif
       
   566 		//Set the changes file name
       
   567 		depPackageInfo->SetChangesFileNameL();
       
   568 		}
       
   569 	CleanupStack::PopAndDestroy(&dependency);
       
   570 	}
       
   571 
       
   572 TInt CXmlParser::StringToInt(const TDesC8& aString, TUint32& aInt)
       
   573 	{
       
   574 	 // Function will return EFalse if string conversion fails.
       
   575 	 TLex8 lex(aString);
       
   576 	 lex.SkipSpace();
       
   577 
       
   578 	 if (lex.Peek() == '0')
       
   579 		 {
       
   580 		 lex.Inc();
       
   581 		 TChar c( lex.Peek() );
       
   582 		 c.LowerCase();
       
   583 		 if (c == 'x')
       
   584 			 {
       
   585 			 lex.Inc();
       
   586 			 return ( lex.Val(aInt,EHex) );
       
   587 			 }
       
   588 		 else
       
   589 			 {
       
   590 			 lex.UnGet();
       
   591 			 }
       
   592 		 }
       
   593 	 return ( lex.Val(aInt,EDecimal) );
       
   594 	}