Home Explore Help
Register Sign In
oberon
/
A2OS
mirror of https://github.com/yarrom/A2OS.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Fixed whitespace in XML modules

git-svn-id: https://svn-dept.inf.ethz.ch/svn/lecturers/a2/trunk@8745 8c9fc860-2736-0410-a75d-ab315db34111
negelef 6 years ago
parent
f30ea82050
commit
92d473b93b
11 changed files with 51 additions and 61 deletions
Unified View Show Diff Stats
  1. 0 4
      source/TestXMLPlugins.Mod
  2. 1 1
      source/WMXMLTree.Mod
  3. 1 1
      source/XML.Mod
  4. 1 3
      source/XMLComponents.Mod
  5. 1 1
      source/XMLGeneratorSchema.Mod
  6. 0 1
      source/XMLLoader.Mod
  7. 39 40
      source/XMLObjects.Mod
  8. 4 6
      source/XMLParser.Mod
  9. 1 1
      source/XMLScanner.Mod
  10. 1 1
      source/XMLStyle.Mod
  11. 2 2
      source/XMLTransformer.Mod

+ 0 - 4
source/TestXMLPlugins.Mod
View File 

@@ -92,13 +92,11 @@ BEGIN
 
 	newLine[0] := 0DX; newLine[1] := 0AX; newLine[2] := 0X;
 
 	newLine[0] := 0DX; newLine[1] := 0AX; newLine[2] := 0X;
 
 END TestXMLPlugins.
 
 END TestXMLPlugins.
 
 
 
-
 
 XMLTransformer.Register A TestXMLPlugins.A ~
 
 XMLTransformer.Register A TestXMLPlugins.A ~
 
 XMLTransformer.Register AB TestXMLPlugins.AB ~
 
 XMLTransformer.Register AB TestXMLPlugins.AB ~
 
 XMLTransformer.Register B TestXMLPlugins.B ~
 
 XMLTransformer.Register B TestXMLPlugins.B ~
 
 XMLTransformer.Register PICT TestXMLPlugins.PICT ~
 
 XMLTransformer.Register PICT TestXMLPlugins.PICT ~
 
 
 
-
 
 Example-HTML-File:
 
 Example-HTML-File:
 
 
 
 <html>
 
 <html>
 
@@ -130,5 +128,3 @@ Example-HTML-File:
 
 
 
 </body>
 
 </body>
 
 </html>
 
 </html>
 
-
 
-

+ 1 - 1
source/WMXMLTree.Mod
View File 

@@ -270,4 +270,4 @@ VAR
 
 
 
 BEGIN
 
 BEGIN
 
 	StrXMLView := Strings.NewString("XMLView");
 
 	StrXMLView := Strings.NewString("XMLView");
 
-END WMXMLTree.
 
+END WMXMLTree.

+ 1 - 1
source/XML.Mod
View File 

@@ -1861,4 +1861,4 @@ END NewString;
 
 
 
 BEGIN
 
 BEGIN
 
 	StrNoName := Strings.NewString("");
 
 	StrNoName := Strings.NewString("");
 
-END XML.
 
+END XML.

+ 1 - 3
source/XMLComponents.Mod
View File 

@@ -5,7 +5,6 @@ IMPORT
 
 	Files, DynamicStrings, XMLObjects, XML, CSS2, CSS2Properties, CSS2Scanner, CSS2Parser,
 
 	Files, DynamicStrings, XMLObjects, XML, CSS2, CSS2Properties, CSS2Scanner, CSS2Parser,
 
 	WMWindowManager, Gfx;
 
 	WMWindowManager, Gfx;
 
 
 
-
 
 TYPE
 
 TYPE
 
 	String* = XML.String;
 
 	String* = XML.String;
 
 
 
@@ -1134,5 +1133,4 @@ TYPE
 
 		RETURN event
 
 		RETURN event
 
 	END ExtractEvent;
 
 	END ExtractEvent;
 
 
 
-
 
-END XMLComponents.
 
+END XMLComponents.

+ 1 - 1
source/XMLGeneratorSchema.Mod
View File 

@@ -63,4 +63,4 @@ BEGIN
 
 	RETURN er
 
 	RETURN er
 
 END OpenGeneratorSchema;
 
 END OpenGeneratorSchema;
 
 
 
-END XMLGeneratorSchema.
 
+END XMLGeneratorSchema.

+ 0 - 1
source/XMLLoader.Mod
View File 

@@ -67,7 +67,6 @@ BEGIN
 
 	DefaultStyleSheet := LoadCSS(cssName)
 
 	DefaultStyleSheet := LoadCSS(cssName)
 
 END SetDefaultStyleSheet;
 
 END SetDefaultStyleSheet;
 
 
 
-
 
 BEGIN
 
 BEGIN
 
 	DefaultXMLElementRegistry := XMLGeneratorSchema.OpenGeneratorSchema(DefaultXMLGeneratorFile);
 
 	DefaultXMLElementRegistry := XMLGeneratorSchema.OpenGeneratorSchema(DefaultXMLGeneratorFile);
 
 	DefaultStyleSheet := LoadCSS(DefaultCSS2File)
 
 	DefaultStyleSheet := LoadCSS(DefaultCSS2File)

+ 39 - 40
source/XMLObjects.Mod
View File 

@@ -3,7 +3,6 @@ MODULE XMLObjects; (** AUTHOR "swalthert"; PURPOSE "XML collections and enumerat
 
 IMPORT
 
 IMPORT
 
 	Strings;
 
 	Strings;
 
 
 
-
 
 TYPE
 
 TYPE
 
 	String = Strings.String;
 
 	String = Strings.String;
 
 
 
@@ -165,52 +164,52 @@ TYPE
 
 		END GetElement;
 
 		END GetElement;
 
 
 
 		PROCEDURE Invert*(ptr1, ptr2: ANY): BOOLEAN;
 
 		PROCEDURE Invert*(ptr1, ptr2: ANY): BOOLEAN;
 
-           	VAR pos1, pos2, i: LONGINT; ptr: ANY;
 
-       	BEGIN {EXCLUSIVE}
 
-           		i := 0;  pos1 := -1;  pos2 := -1;
 
-          		 WHILE (i < nofElems) & ((pos1 < 0) OR (pos2 < 0)) DO
 
-              		 IF elems[i] = ptr1 THEN  pos1 := i  END;
 
-              		 IF elems[i] = ptr2 THEN  pos2 := i  END;
 
-              		 INC(i)
 
-          		 END;
 
-           		IF (pos1 >= 0) & (pos2 >= 0) & (pos1 # pos2)  THEN
 
-               		ptr := elems[pos1];  elems[pos1] := elems[pos2];  elems[pos2] := ptr;
 
-               		RETURN TRUE
 
-           		END;
 
-           		RETURN FALSE
 
-       	END Invert;
 
+		VAR pos1, pos2, i: LONGINT; ptr: ANY;
 
+		BEGIN {EXCLUSIVE}
 
+			i := 0;  pos1 := -1;  pos2 := -1;
 
+			WHILE (i < nofElems) & ((pos1 < 0) OR (pos2 < 0)) DO
 
+				IF elems[i] = ptr1 THEN  pos1 := i  END;
 
+				IF elems[i] = ptr2 THEN  pos2 := i  END;
 
+				INC(i)
 
+			END;
 
+			IF (pos1 >= 0) & (pos2 >= 0) & (pos1 # pos2)  THEN
 
+				ptr := elems[pos1];  elems[pos1] := elems[pos2];  elems[pos2] := ptr;
 
+				RETURN TRUE
 
+			END;
 
+			RETURN FALSE
 
+		END Invert;
 
 
 
 		PROCEDURE GetElementPos*(ptr: ANY): LONGINT;
 
 		PROCEDURE GetElementPos*(ptr: ANY): LONGINT;
 
-           	VAR i: LONGINT;
 
+		VAR i: LONGINT;
 
 		BEGIN
 
 		BEGIN
 
-          		 WHILE i < nofElems DO
 
-              		 IF elems[i] = ptr THEN  RETURN i END;
 
-              		 INC(i)
 
-          		 END;
 
-          		 RETURN -1
 
+			WHILE i < nofElems DO
 
+				IF elems[i] = ptr THEN  RETURN i END;
 
+				INC(i)
 
+			END;
 
+			RETURN -1
 
 		END GetElementPos;
 
 		END GetElementPos;
 
 
 
 		PROCEDURE MoveUp*(ptr: ANY;  i: LONGINT): BOOLEAN;
 
 		PROCEDURE MoveUp*(ptr: ANY;  i: LONGINT): BOOLEAN;
 
-           	VAR p: ANY;
 
-       	BEGIN {EXCLUSIVE}
 
-           		IF ptr # NIL THEN  i := GetElementPos(ptr)  END;
 
-           		IF (i > 0) & (i < nofElems)  THEN
 
-               		p := elems[i];  elems[i] := elems[i-1];  elems[i-1] := p;
 
-               		RETURN TRUE
 
-           		END;
 
-           		RETURN FALSE
 
-       	END MoveUp;
 
+		VAR p: ANY;
 
+		BEGIN {EXCLUSIVE}
 
+			IF ptr # NIL THEN  i := GetElementPos(ptr)  END;
 
+			IF (i > 0) & (i < nofElems)  THEN
 
+				p := elems[i];  elems[i] := elems[i-1];  elems[i-1] := p;
 
+				RETURN TRUE
 
+			END;
 
+			RETURN FALSE
 
+		END MoveUp;
 
 
 
 		PROCEDURE MoveDown*(ptr: ANY;  i: LONGINT): BOOLEAN;
 
 		PROCEDURE MoveDown*(ptr: ANY;  i: LONGINT): BOOLEAN;
 
-           	VAR p: ANY;
 
-       	BEGIN {EXCLUSIVE}
 
-           		IF ptr # NIL THEN  i := GetElementPos(ptr)  END;
 
-           		IF (i >=0) & (i < nofElems-1)  THEN
 
-               		p := elems[i];  elems[i] := elems[i+1];  elems[i+1] := p;
 
-               		RETURN TRUE
 
-           		END;
 
-           		RETURN FALSE
 
-       	END MoveDown;
 
+		VAR p: ANY;
 
+		BEGIN {EXCLUSIVE}
 
+			IF ptr # NIL THEN  i := GetElementPos(ptr)  END;
 
+			IF (i >=0) & (i < nofElems-1)  THEN
 
+				p := elems[i];  elems[i] := elems[i+1];  elems[i+1] := p;
 
+				RETURN TRUE
 
+			END;
 
+			RETURN FALSE
 
+		END MoveDown;
 
 
 
 	END ArrayCollection;
 
 	END ArrayCollection;
 
 
 
@@ -406,4 +405,4 @@ BEGIN
 
 	RETURN i
 
 	RETURN i
 
 END StringLength;
 
 END StringLength;
 
 
 
-END XMLObjects.
 
+END XMLObjects.

+ 4 - 6
source/XMLParser.Mod
View File 

@@ -399,7 +399,7 @@ TYPE
 
 				IF scanner.sym =  Scanner.PoundName THEN
 
 				IF scanner.sym =  Scanner.PoundName THEN
 
 					IF (s^ = '#REQUIRED') THEN
 
 					IF (s^ = '#REQUIRED') THEN
 
 						ad.SetRequired(TRUE)
 
 						ad.SetRequired(TRUE)
 
-					 ELSIF (s^ = '#FIXED') THEN
 
+					ELSIF (s^ = '#FIXED') THEN
 
 						ad.SetRequired(TRUE);
 
 						ad.SetRequired(TRUE);
 
 						scanner.ScanMarkup();
 
 						scanner.ScanMarkup();
 
 						IF ~CheckSymbol({Scanner.Literal}, "AttValue expected") THEN RETURN END
 
 						IF ~CheckSymbol({Scanner.Literal}, "AttValue expected") THEN RETURN END
 
@@ -422,12 +422,12 @@ TYPE
 
 		END ParseAttListDecl;
 
 		END ParseAttListDecl;
 
 
 
 		(*
 
 		(*
 
-			Mixed 		::=	'(' S? '#PCDATA' (S? '|' S? Name)* S? ')*'
 
+			Mixed		::=	'(' S? '#PCDATA' (S? '|' S? Name)* S? ')*'
 
 							| '(' S? '#PCDATA' S? ')'
 
 							| '(' S? '#PCDATA' S? ')'
 
 
 
 			children		::=	(choise | seq) ('?' | '*' | '+')?
 
 			children		::=	(choise | seq) ('?' | '*' | '+')?
 
-			cp 			::=	(Name | choise | seq) ('?' | '*' | '+')?
 
-			choice 		::=	'(' S? cp (S? '|' S? cp)+ S? ')'
 
+			cp			::=	(Name | choise | seq) ('?' | '*' | '+')?
 
+			choice		::=	'(' S? cp (S? '|' S? cp)+ S? ')'
 
 			seq			::=	'(' S? cp (S? ',' S? cp)* S? ')'
 
 			seq			::=	'(' S? cp (S? ',' S? cp)* S? ')'
 
 		*)
 
 		*)
 
 		PROCEDURE ParseContentParticle(VAR contentType: SHORTINT): XML.CollectionCP;
 
 		PROCEDURE ParseContentParticle(VAR contentType: SHORTINT): XML.CollectionCP;
 
@@ -949,8 +949,6 @@ TYPE
 
 			RETURN ds1.ToArrOfChar()
 
 			RETURN ds1.ToArrOfChar()
 
 		END ParseEntityValue;
 
 		END ParseEntityValue;
 
 
 
-
 
-
 
 		PROCEDURE ParseAttributeValue(): String;
 
 		PROCEDURE ParseAttributeValue(): String;
 
 		VAR
 
 		VAR
 
 			s, es: String; start, end, len, val: LONGINT; msg: ARRAY 17 OF CHAR;
 
 			s, es: String; start, end, len, val: LONGINT; msg: ARRAY 17 OF CHAR;

+ 1 - 1
source/XMLScanner.Mod
View File 

@@ -43,7 +43,7 @@ CONST
 
 	ParamEntityRef* = 18;	(** '%' name ';', name := GetStr() *)
 
 	ParamEntityRef* = 18;	(** '%' name ';', name := GetStr() *)
 
 	CharData* = 19;	(** chars := GetStr() *)
 
 	CharData* = 19;	(** chars := GetStr() *)
 
 	Literal* = 20;	(** '"'chars'"' or "'"chars"'", chars := GetStr() *)
 
 	Literal* = 20;	(** '"'chars'"' or "'"chars"'", chars := GetStr() *)
 
-	Name* = 21;	(** 	Name ::= (Letter | '_' | ':') {NameChar}
 
+	Name* = 21;	(**	Name ::= (Letter | '_' | ':') {NameChar}
 
 										NameChar ::= Letter | Digit | '.' | '-' | '_' | ':' | CombiningChar | Extender
 
 										NameChar ::= Letter | Digit | '.' | '-' | '_' | ':' | CombiningChar | Extender
 
 										chars := GetStr() *)
 
 										chars := GetStr() *)
 
 	Nmtoken* = 22;	(**	Nmtoken ::= NameChar {NameChar}, chars := GetStr() *)
 
 	Nmtoken* = 22;	(**	Nmtoken ::= NameChar {NameChar}, chars := GetStr() *)

+ 1 - 1
source/XMLStyle.Mod
View File 

@@ -256,4 +256,4 @@ BEGIN
 
 	RETURN FALSE
 
 	RETURN FALSE
 
 END SelectFirstChild;
 
 END SelectFirstChild;
 
 
 
-END XMLStyle.
 
+END XMLStyle.

+ 2 - 2
source/XMLTransformer.Mod
View File 

@@ -135,7 +135,7 @@ BEGIN
 
 	WHILE cur # NIL DO
 
 	WHILE cur # NIL DO
 
 		w.Char('"'); w.String(cur.name); w.Char('"'); w.Char(09X);
 
 		w.Char('"'); w.String(cur.name); w.Char('"'); w.Char(09X);
 
 		w.Char('"'); w.String(cur.procedure); w.Char('"'); w.Ln;
 
 		w.Char('"'); w.String(cur.procedure); w.Char('"'); w.Ln;
 
- 		cur := cur.next
 
+		cur := cur.next;
 
 	END;
 
 	END;
 
 	w.Update
 
 	w.Update
 
 END StoreXMLPlugins;
 
 END StoreXMLPlugins;
 
@@ -160,4 +160,4 @@ END LoadXMLPlugins;
 
 
 
 BEGIN
 
 BEGIN
 
 	LoadXMLPlugins;
 
 	LoadXMLPlugins;
 
-END XMLTransformer.
 
+END XMLTransformer.