[SCM] Lisaac compiler branch, mildred-projects, updated. lisaac-0.12-503-g64b7bec
Mildred Ki'Lya
silkensedai at online.fr
Mon Aug 24 20:14:10 UTC 2009
The following commit has been merged in the mildred-projects branch:
commit 595e40fcaf9cb4405f29f80983571b4d5fca6e21
Author: Mildred Ki'Lya <silkensedai at online.fr>
Date: Mon Aug 24 15:14:30 2009 +0200
update syntax for Lisaac 0.14
diff --git a/src/item/itm_type_parameter.li b/src/item/itm_type_parameter.li
index 08c8c97..f1fd001 100644
--- a/src/item/itm_type_parameter.li
+++ b/src/item/itm_type_parameter.li
@@ -33,8 +33,8 @@ Section Inherit
Section ITM_TYPE_SIMPLE
- - dico :HASHED_DICTIONARY[ITM_TYPE_PARAMETER,STRING_CONSTANT] :=
- HASHED_DICTIONARY[ITM_TYPE_PARAMETER,STRING_CONSTANT].create;
+ - dico :HASHED_DICTIONARY(ITM_TYPE_PARAMETER,STRING_CONSTANT) :=
+ HASHED_DICTIONARY(ITM_TYPE_PARAMETER,STRING_CONSTANT).create;
- create n:STRING_CONSTANT :SELF <- create n source NULL;
diff --git a/src/lip/lip_call.li b/src/lip/lip_call.li
index 0571c98..bdecd03 100644
--- a/src/lip/lip_call.li
+++ b/src/lip/lip_call.li
@@ -144,8 +144,8 @@ Section Public
result := prj.call name arg val from project position position;
(result = NULL).if {
error_slot_not_found "Code slot" name name project (prj.name) send TRUE;
- }
- }
+ };
+ };
}.elseif {name = ALIAS_STR.slot_print} then {
self.print;
} else {
@@ -230,7 +230,7 @@ Section Public
result := prj.call name arg val from project position position;
(result = NULL).if {
error_slot_not_found "Data slot" name name project (prj.name) send TRUE;
- }
+ };
}
} else {
error_slot_not_found "Slot" name name;
diff --git a/src/lip/lip_project.li b/src/lip/lip_project.li
index 4532a32..47dec54 100644
--- a/src/lip/lip_project.li
+++ b/src/lip/lip_project.li
@@ -38,11 +38,11 @@ Section Public
- make :SELF <-
(
- items := FAST_ARRAY[PRJ_ITEM].create_with_capacity 128;
- list_parent := FAST_ARRAY[STRING_CONSTANT].create_with_capacity 1;
- list_method := FAST_ARRAY[LIP_SLOT_CODE].create_with_capacity 32;
- list_data := HASHED_DICTIONARY[LIP_SLOT_DATA,STRING_CONSTANT].create;
- list_prj := FAST_ARRAY[LIP_PROJECT].create_with_capacity 8;
+ items := FAST_ARRAY(PRJ_ITEM).create_with_capacity 128;
+ list_parent := FAST_ARRAY(STRING_CONSTANT).create_with_capacity 1;
+ list_method := FAST_ARRAY(LIP_SLOT_CODE).create_with_capacity 32;
+ list_data := HASHED_DICTIONARY(LIP_SLOT_DATA,STRING_CONSTANT).create;
+ list_prj := FAST_ARRAY(LIP_PROJECT).create_with_capacity 8;
Self
);
@@ -79,19 +79,19 @@ Section Public
};
);
- + list_parent:FAST_ARRAY[STRING_CONSTANT];
+ + list_parent:FAST_ARRAY(STRING_CONSTANT);
// List the parent .lip files (Section Inherit in .lip)
- + list_method:FAST_ARRAY[LIP_SLOT_CODE];
+ + list_method:FAST_ARRAY(LIP_SLOT_CODE);
// List of all code slots
- + list_data:HASHED_DICTIONARY[LIP_SLOT_DATA,STRING_CONSTANT];
+ + list_data:HASHED_DICTIONARY(LIP_SLOT_DATA,STRING_CONSTANT);
// List of all data slots
- + list_prj:FAST_ARRAY[LIP_PROJECT];
+ + list_prj:FAST_ARRAY(LIP_PROJECT);
// List of all sub projects
- + items :FAST_ARRAY[PRJ_ITEM];
+ + items :FAST_ARRAY(PRJ_ITEM);
// List of all items
+ path :STRING_CONSTANT := ALIAS_STR.path_current;
@@ -102,7 +102,7 @@ Section Public
+ is_public :BOOLEAN := FALSE;
- is_private:BOOLEAN <- ! is_public;
- - set_public pub:BOOLEAN <- is_public := pub;
+ - set_public pub:BOOLEAN <- (is_public := pub;);
- initialized :BOOLEAN <- file != NULL;
@@ -286,7 +286,6 @@ Section Public
prj.append_info_project_in buffer indent (ALIAS_STR.get string_tmp);
buffer.append "\n";
buffer.append indent;
- ALIAS_STR.get buffer
};
buffer.append "\n";
@@ -396,7 +395,7 @@ Section Public
((itm_found != NULL) && {itm_found.source_project != Self}).if {
similarity := -1;
itm_found := NULL;
- }
+ };
};
// Search for similarity
(other = NULL).if {
diff --git a/src/lip/lip_valueproject.li b/src/lip/lip_valueproject.li
index 488c62d..4d548db 100644
--- a/src/lip/lip_valueproject.li
+++ b/src/lip/lip_valueproject.li
@@ -33,7 +33,7 @@ Section Inherit
Section Private
- - storage:FAST_ARRAY[LIP_VALUEPROJECT] := FAST_ARRAY[LIP_VALUEPROJECT].create_with_capacity 10;
+ - storage:FAST_ARRAY(LIP_VALUEPROJECT) := FAST_ARRAY(LIP_VALUEPROJECT).create_with_capacity 10;
- set_value p:LIP_PROJECT <-
(
@@ -177,7 +177,7 @@ Section Public
}.elseif {(name = ALIAS_STR.slot_public) && {val = NULL}} then {
//prj_pub := TRUE;
//(value != NULL).if { value.set_public TRUE; };
- (value = NULL).if { value := LIP_PROJECT.create};
+ (value = NULL).if { value := LIP_PROJECT.create; };
value.set_public TRUE;
//
@@ -186,7 +186,7 @@ Section Public
}.elseif {(name = ALIAS_STR.slot_private) && {val = NULL}} then {
//prj_pub := FALSE;
//(value != NULL).if { value.set_public FALSE; };
- (value = NULL).if { value := LIP_PROJECT.create};
+ (value = NULL).if { value := LIP_PROJECT.create; };
value.set_public FALSE;
//
@@ -198,7 +198,7 @@ Section Public
semantic_error (position,"String argument needed.");
};
//prj_name := str.value;
- (value = NULL).if { value := LIP_PROJECT.create};
+ (value = NULL).if { value := LIP_PROJECT.create; };
value.set_protoname (str.value);
//
@@ -245,7 +245,7 @@ Section Public
result := LIP_STRING.get (ALIAS_STR.get string_tmp);
} else {
- result := NULL
+ result := NULL;
};
};
@@ -264,14 +264,14 @@ Section LIP_CONSTANT
Self
);
- - '=#' other:SELF :LIP_CONSTANT <-
+ - Self:SELF '=#' other:SELF :LIP_CONSTANT <-
(
other.free;
free;
LIP_BOOLEAN.get (value = other.value)
);
- - '!=#' other:SELF :LIP_CONSTANT <-
+ - Self:SELF '!=#' other:SELF :LIP_CONSTANT <-
(
other.free;
free;
diff --git a/src/lip/prj_item.li b/src/lip/prj_item.li
index 08e4151..65dfa2e 100644
--- a/src/lip/prj_item.li
+++ b/src/lip/prj_item.li
@@ -49,7 +49,7 @@ Section Public
+ is_public :BOOLEAN := TRUE;
- is_private:BOOLEAN <- !is_public;
- - set_public pub:BOOLEAN <- is_public := pub;
+ - set_public pub:BOOLEAN <- (is_public := pub;);
+ projectprotopath :STRING_CONSTANT <- externprotopath;
@@ -182,8 +182,8 @@ Section LIP_PROJECT
i := i + 1;
};
- match.if { match := (i <= 1) || {protopath.item i == '.'} };
- match.if { match := (i <= j) };
+ match.if { match := (i <= 1) || {protopath.item i == '.'}; };
+ match.if { match := (i <= j); };
};
diff --git a/src/type/prototype.li b/src/type/prototype.li
index 68af4cb..4c34b04 100644
--- a/src/type/prototype.li
+++ b/src/type/prototype.li
@@ -45,8 +45,8 @@ Section Public
+ index:INTEGER; // in `prototype_list', for POSITION.
- + itm_source :FAST_ARRAY[PRJ_ITEM] :=
- FAST_ARRAY[PRJ_ITEM].create_with_capacity 1;
+ + itm_source :FAST_ARRAY(PRJ_ITEM) :=
+ FAST_ARRAY(PRJ_ITEM).create_with_capacity 1;
+ shortname:STRING_CONSTANT;
@@ -192,7 +192,7 @@ Section Public
filename := f;
longname := n;
- itm_source := FAST_ARRAY[PRJ_ITEM].create_with_capacity 1;
+ itm_source := FAST_ARRAY(PRJ_ITEM).create_with_capacity 1;
itm_source.add_last s;
idx := n.fast_last_index_of '.';
(idx != 0).if {
--
Lisaac compiler
More information about the Lisaac-commits
mailing list