Project

General

Profile

Revision 12

Added by over 7 years ago

latest version of the ooas compiler, with grammar version 1.10

View differences:

ooaCustomParser.java
499 499
		if (rangeLow.getType() == ooaLexer.T_IDENTIFIER)
500 500
		{
501 501
			// see whether we can find the constant
502
			final Identifier aconst = pState.currentScope.ResolveIdentifier(rangeLow.getText());
502
			final Identifier aconst = pState.Lookup(rangeLow.getText());
503 503
			if (aconst == null || aconst.kind() != IdentifierKind.Constant)
504 504
				doError(rangeLow, String.format("Constant %s not found", rangeLow.getText()));
505 505
			else if (aconst.type().kind() != TypeKind.IntType)
......
553 553
		if (rangeLow.getType() == ooaLexer.T_IDENTIFIER)
554 554
		{
555 555
			// see whether we can find the constant
556
			final Identifier aconst = pState.currentScope.ResolveIdentifier(rangeLow.getText());
556
			final Identifier aconst = pState.Lookup(rangeLow.getText());
557 557
			if (aconst == null || aconst.kind() != IdentifierKind.Constant)
558 558
				doError(rangeLow, String.format("Constant %s not found", rangeLow.getText()));
559 559
			else if (aconst.type().kind() != TypeKind.FloatType)
......
707 707
		if (numOfElements.getType() == ooaLexer.T_IDENTIFIER)
708 708
		{
709 709
			// see whether we can find the constant
710
			final Identifier aconst = pState.currentScope.ResolveIdentifier(numOfElements.getText());
710
			final Identifier aconst = pState.Lookup(numOfElements.getText());
711 711
			if (aconst == null || aconst.kind() != IdentifierKind.Constant)
712 712
				doError(numOfElements, String.format("Constant %s not found", numOfElements.getText()));
713 713
			else if (aconst.type().kind() != TypeKind.IntType)
......
744 744
		if (numOfElements.getType() == ooaLexer.T_IDENTIFIER)
745 745
		{
746 746
			// see whether we can find the constant
747
			final Identifier aconst = pState.currentScope.ResolveIdentifier(numOfElements.getText());
747
			final Identifier aconst = pState.Lookup(numOfElements.getText());
748 748
			if (aconst == null || aconst.kind() != IdentifierKind.Constant)
749 749
				doError(numOfElements, String.format("Constant %s not found", numOfElements.getText()));
750 750
			else if (aconst.type().kind() != TypeKind.IntType)

Also available in: Unified diff