[SCM] Lisaac compiler branch, master, updated. ea3d930dc191d11699ac7708e70856a01c73aee0
Jeremy Cowgar
jeremy at cowgar.com
Thu Jul 30 01:38:08 UTC 2009
The following commit has been merged in the master branch:
commit ea3d930dc191d11699ac7708e70856a01c73aee0
Author: Jeremy Cowgar <jeremy at cowgar.com>
Date: Wed Jul 29 21:38:00 2009 -0400
* More tab cleanup
diff --git a/lib2/file_system/entry.li b/lib2/file_system/entry.li
index 55ddf95..51020f3 100644
--- a/lib2/file_system/entry.li
+++ b/lib2/file_system/entry.li
@@ -121,60 +121,60 @@ Section ENTRY
{i > st.upper}.until_do {
car := st.item i;
(car = '/').if {
- // Separator character.
- stat.when 0 then {
- // foo/bar => foo/bar
- // ^ ^
- stat := 1;
- }.when 1 then {
- // foo//bar => /bar
- // ^ ^
- st.remove_first (i-1);
- i := st.lower;
- }.when 2 then {
- // foo/./bar => foo/bar
- // ^ ^
- st.remove_between (i-1) to i;
- i := i - 2;
- stat := 1;
- }.when 3 then {
- // toto/foo/../bar => toto/bar
- // ^ ^
- + idx:INTEGER;
- idx := st.last_index_of '/' since (i-4);
- // st.last_index_of '/' since (i-4);
- (idx = 0).if {
- st.remove_first (i-1);
- i := st.lower;
- } else {
- st.remove_between idx to (i-1);
- i := idx;
- };
- stat := 1;
- };
+ // Separator character.
+ stat.when 0 then {
+ // foo/bar => foo/bar
+ // ^ ^
+ stat := 1;
+ }.when 1 then {
+ // foo//bar => /bar
+ // ^ ^
+ st.remove_first (i-1);
+ i := st.lower;
+ }.when 2 then {
+ // foo/./bar => foo/bar
+ // ^ ^
+ st.remove_between (i-1) to i;
+ i := i - 2;
+ stat := 1;
+ }.when 3 then {
+ // toto/foo/../bar => toto/bar
+ // ^ ^
+ + idx:INTEGER;
+ idx := st.last_index_of '/' since (i-4);
+ // st.last_index_of '/' since (i-4);
+ (idx = 0).if {
+ st.remove_first (i-1);
+ i := st.lower;
+ } else {
+ st.remove_between idx to (i-1);
+ i := idx;
+ };
+ stat := 1;
+ };
}.elseif {car = '.'} then {
- // Point character.
- (stat)
- .when 0 then {
- // foo.bar => foo.bar
- }.when 1 then {
- // foo/.bar => foo/.bar
- stat := 2;
- }.when 2 then {
- // foo/..bar => foo/..bar
- stat := 3;
- }.when 3 then {
- // foo/...bar => foo/...bar
- stat := 0;
- };
+ // Point character.
+ (stat)
+ .when 0 then {
+ // foo.bar => foo.bar
+ }.when 1 then {
+ // foo/.bar => foo/.bar
+ stat := 2;
+ }.when 2 then {
+ // foo/..bar => foo/..bar
+ stat := 3;
+ }.when 3 then {
+ // foo/...bar => foo/...bar
+ stat := 0;
+ };
}.elseif {(car = ':') && {i > 2} &&
- {st.item (i-1).is_letter} && {st.item (i-2) = '/'}
+ {st.item (i-1).is_letter} && {st.item (i-2) = '/'}
} then {
- st.remove_first (i-2);
- i := st.lower;
+ st.remove_first (i-2);
+ i := st.lower;
} else {
- // Other character.
- stat := 0;
+ // Other character.
+ stat := 0;
};
i := i + 1;
};
@@ -196,9 +196,9 @@ Section ENTRY
+ idx:INTEGER;
idx := st.last_index_of '/' since (i-4);
(idx = 0).if {
- st.clear;
+ st.clear;
} else {
- st.remove_between idx to (i-1);
+ st.remove_between idx to (i-1);
};
};
@@ -225,9 +225,8 @@ Section ENTRY
tmp.copy "../";
} else {
tmp.keep_head (i-1);
- (tmp.is_empty).if {
- tmp.add_last '/';
+ (tmp.is_empty).if {
+ tmp.add_last '/';
};
};
);
-
diff --git a/lib2/io/input_stream.li b/lib2/io/input_stream.li
index 1629a93..9119fd8 100644
--- a/lib2/io/input_stream.li
+++ b/lib2/io/input_stream.li
@@ -130,14 +130,14 @@ Section Public
stop := FALSE;
stop.until_do {
end_of_input.if {
- stop := TRUE;
+ stop := TRUE;
} else {
- (( last_character = '\n') || {last_character = '\b'}).if {
- read_character;
- stop := TRUE;
- } else {
- read_character;
- };
+ (( last_character = '\n') || {last_character = '\b'}).if {
+ read_character;
+ stop := TRUE;
+ } else {
+ read_character;
+ };
};
};
);
@@ -164,40 +164,40 @@ Section Public
{ state > 2 }.until_do {
read_character;
(state = 0).if {
- (last_character.is_separator).if {
- }.elseif { last_character.is_digit} then {
- last_integer := last_character.decimal_value;
- state := 2;
- }.elseif { last_character = '-'} then {
- sign := TRUE;
- state := 1;
- }.elseif { last_character = '+'} then {
- state := 1;
- } else {
- state := 4;
- };
+ (last_character.is_separator).if {
+ }.elseif { last_character.is_digit} then {
+ last_integer := last_character.decimal_value;
+ state := 2;
+ }.elseif { last_character = '-'} then {
+ sign := TRUE;
+ state := 1;
+ }.elseif { last_character = '+'} then {
+ state := 1;
+ } else {
+ state := 4;
+ };
}.elseif {state = 1} then {
- (last_character.is_separator).if {
- }.elseif { last_character.is_digit } then {
- last_integer := last_character.decimal_value;
- state := 2;
- } else {
- state := 4;
- };
+ (last_character.is_separator).if {
+ }.elseif { last_character.is_digit } then {
+ last_integer := last_character.decimal_value;
+ state := 2;
+ } else {
+ state := 4;
+ };
} else { // 2
- ( last_character.is_digit ).if {
- last_integer := (last_integer * 10) + last_character.decimal_value;
- } else {
- state := 3;
- };
+ ( last_character.is_digit ).if {
+ last_integer := (last_integer * 10) + last_character.decimal_value;
+ } else {
+ state := 3;
+ };
};
end_of_input.if {
- state.when 0 to 1 then {
- state := 4;
- }.when 2 to 3 then {
- state := 3;
- };
+ state.when 0 to 1 then {
+ state := 4;
+ }.when 2 to 3 then {
+ state := 3;
+ };
};
};
@@ -247,52 +247,52 @@ Section Public
{ state >= 4 }.until_do {
read_character;
( state = 0).if {
- (last_character.is_separator).if {
- }.elseif { last_character.is_digit } then {
- last_string.add_last last_character;
- state := 2;
- }.elseif { last_character = '-' } then {
- sign := TRUE;
- state := 1;
- }.elseif { last_character = '+' } then {
- state := 1;
- }.elseif { last_character = '.' } then {
- last_string.add_last last_character;
- state := 3;
- } else {
- state := 5;
- };
+ (last_character.is_separator).if {
+ }.elseif { last_character.is_digit } then {
+ last_string.add_last last_character;
+ state := 2;
+ }.elseif { last_character = '-' } then {
+ sign := TRUE;
+ state := 1;
+ }.elseif { last_character = '+' } then {
+ state := 1;
+ }.elseif { last_character = '.' } then {
+ last_string.add_last last_character;
+ state := 3;
+ } else {
+ state := 5;
+ };
}.elseif { state = 1 } then {
- ( last_character.is_separator ).if {
- }.elseif { last_character.is_digit } then {
- last_string.add_last last_character;
- state := 2;
- } else {
- state := 5;
- };
+ ( last_character.is_separator ).if {
+ }.elseif { last_character.is_digit } then {
+ last_string.add_last last_character;
+ state := 2;
+ } else {
+ state := 5;
+ };
}.elseif { state = 2 } then {
- ( last_character.is_digit ).if {
- last_string.add_last last_character;
- }.elseif { last_character = '.' } then {
- last_string.add_last last_character;
- state := 3;
- } else {
- state := 4;
- };
+ ( last_character.is_digit ).if {
+ last_string.add_last last_character;
+ }.elseif { last_character = '.' } then {
+ last_string.add_last last_character;
+ state := 3;
+ } else {
+ state := 4;
+ };
} else { // 3
- ( last_character.is_digit ).if {
- last_string.add_last last_character;
- } else {
- state := 4;
- };
+ ( last_character.is_digit ).if {
+ last_string.add_last last_character;
+ } else {
+ state := 4;
+ };
};
end_of_input.if {
- state.when 2 to 4 then {
- state := 4;
- } else {
- state := 5;
- };
+ state.when 2 to 4 then {
+ state := 4;
+ } else {
+ state := 5;
+ };
};
};
@@ -367,9 +367,9 @@ Section Public
{stop}.until_do {
read_character;
( end_of_input || { last_character = '\n' }).if {
- stop := TRUE;
+ stop := TRUE;
} else {
- last_string.extend last_character;
+ last_string.extend last_character;
};
};
);
@@ -394,20 +394,20 @@ Section Public
// Reach the first character of the `keyword':
i := 2;
{ (i > last_string.count) || { last_string.item i = first }}.until_do {
- i := i + 1;
+ i := i + 1;
};
( i <= last_string.count ).if {
- last_string.remove_first (i - 1);
+ last_string.remove_first (i - 1);
} else {
- last_string.clear;
- !end_of_input.if {
- read_character;
- };
- { end_of_input || { last_character = first } }.until_do {
- read_character;
- };
- last_string.extend last_character;
+ last_string.clear;
+ !end_of_input.if {
+ read_character;
+ };
+ { end_of_input || { last_character = first } }.until_do {
+ read_character;
+ };
+ last_string.extend last_character;
};
? { !end_of_input ->> {last_string.item 1 = first}};
@@ -415,8 +415,8 @@ Section Public
// Now we need as many characters as in `keyword':
{ end_of_input || { last_string.count = keyword.count } }.until_do {
- read_character;
- last_string.extend last_character;
+ read_character;
+ last_string.extend last_character;
};
stop := last_string == keyword;
};
@@ -464,7 +464,7 @@ Section Public
end_of_input.until_do {
read_character;
!end_of_input.if {
- str.extend last_character;
+ str.extend last_character;
};
};
--
Lisaac compiler
More information about the Lisaac-commits
mailing list