Added readReal and writeReal ops to i/o channels. (OMG Issue FUML13-21)

seidewitz · seidewitz · commit 025aa6469606 · 2017-01-17T23:38:32.000-05:00
diff --git a/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/library/channel/StandardInputChannelObject.java b/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/library/channel/StandardInputChannelObject.java
@@ -1,3 +1,11 @@
+/*
+ * Copyright 2011-2017 Data Access Technologies, Inc. (Model Driven Solutions)
+ * 
+ * Licensed under the Academic Free License version 3.0 
+ * (http://www.opensource.org/licenses/afl-3.0.php), except as stated 
+ * in the file entitled Licensing-Information. 
+ */
+
 package org.modeldriven.fuml.library.channel;
 
 import java.io.BufferedReader;
@@ -224,6 +232,86 @@ public Integer readInteger(Status errorStatus) {
 		}
 	}
 
+	@Override
+	public Float readReal(Status errorStatus) {
+		if (!this.isOpen()) {
+			errorStatus.setStatus("StandardInputChannel", -1, "Not open");
+			return null;
+		} else {
+			try {
+				StringBuilder image = new StringBuilder();
+				
+				this.reader.mark(2);
+				int c = this.reader.read();
+				if (c == ((char)'+') || c == ((char)'-')) {
+					image.append((char)c);
+					c = this.reader.read();
+				}
+				
+				if (!readDigits(c, image)) {
+					if (c < 0) {
+						errorStatus.setStatus("StandardInputChannel", -2, "No Input");
+					} else {
+						errorStatus.setStatus("StandardInputChannel", -3, "Cannot convert");
+					}
+					this.reader.reset();
+					return null;
+				} else {
+					this.reader.mark(1);
+					c = this.reader.read();
+					if (c != ((char)'.')) {
+						this.reader.reset();
+					} else {
+						image.append('.');
+						this.reader.mark(2);
+						this.readDigits(this.reader.read(), image);
+					}
+					this.reader.mark(3);
+					c = this.reader.read();
+					if (c != ((char)'E') && c != ((char)'e')) {
+						this.reader.reset();
+					} else {
+						image.append('E');
+						c = this.reader.read();
+						if (c == ((char)'+') || c == ((char)'-')) {
+							image.append((char)c);
+							c = this.reader.read();
+						}
+						if (!readDigits(c, image)) {
+							image.append('0');
+						}
+					}
+					return Float.valueOf(image.toString());
+				}
+				
+			} catch (IOException e) {
+				errorStatus.setStatus("StandardInputChannel", -100, e.getMessage());
+				return null;
+			}
+		}
+	}
+	
+	private boolean readDigits(int c, StringBuilder s) throws IOException {
+		    if (c < ((int)'0') || c > ((int)'9')) {
+		    	this.reader.reset();
+		    	return false;
+		    } else {
+				s.append((char)c);
+				
+				while (true) {
+					this.reader.mark(1);
+					c = this.reader.read();
+					
+					if (c >= ((int)'0') && c <= ((int)'9')) {
+						s.append((char)c);
+					} else {
+						this.reader.reset();
+						return true;
+					}
+				}
+		    }
+	}
+
 	@Override
 	public UnlimitedNatural readUnlimitedNatural(Status errorStatus) {
 		UnlimitedNatural u = null;
@@ -283,7 +371,7 @@ private Integer readNatural(int c, Status errorStatus) {
 			return null;
 		}
 	}
-
+	
 	@Override
 	public Value new_() {
 		return (Value)new StandardInputChannelObject();
diff --git a/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/library/channel/TextInputChannelObject.java b/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/library/channel/TextInputChannelObject.java
@@ -1,5 +1,6 @@
 /*
- * Copyright 2011 Data Access Technologies, Inc. (Model Driven Solutions)
+ * Copyright 2011-2017 Data Access Technologies, Inc. (Model Driven Solutions)
+ * 
  * Licensed under the Academic Free License version 3.0 
  * (http://www.opensource.org/licenses/afl-3.0.php), except as stated 
  * in the file entitled Licensing-Information. 
@@ -15,6 +16,7 @@
 import fUML.Semantics.Classes.Kernel.BooleanValue;
 import fUML.Semantics.Classes.Kernel.IntegerValue;
 import fUML.Semantics.Classes.Kernel.PrimitiveValue;
+import fUML.Semantics.Classes.Kernel.RealValue;
 import fUML.Semantics.Classes.Kernel.StringValue;
 import fUML.Semantics.Classes.Kernel.UnlimitedNaturalValue;
 
@@ -24,6 +26,7 @@ public abstract class TextInputChannelObject extends InputChannelObject {
 	public abstract String peekCharacter(Status errorStatus);
 	public abstract String readLine(Status errorStatus);
 	public abstract Integer readInteger(Status errorStatus);
+	public abstract Float readReal(Status errorStatus);
 	public abstract Boolean readBoolean(Status errorStatus);
 	public abstract UnlimitedNatural readUnlimitedNatural(Status errorStatus);
 
@@ -65,6 +68,14 @@ public void execute(OperationExecution execution) {
 	            ((IntegerValue)resultValue).value = result;
             }
             this.updateStatus(execution, status);
+        } else if (name.equals("readReal")) {
+            Float result = this.readReal(status);
+            if (result != null) {
+	            resultValue = new RealValue();
+	            resultValue.type = this.locus.factory.getBuiltInType("Real");
+	            ((RealValue)resultValue).value = result;
+            }
+            this.updateStatus(execution, status);
         } else if (name.equals("readBoolean")) {
             Boolean result = this.readBoolean(status);
             if (result != null) {
diff --git a/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/library/channel/TextOutputChannelObject.java b/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/library/channel/TextOutputChannelObject.java
@@ -1,14 +1,12 @@
 /*
  * Copyright 2008 Lockheed Martin Corporation, except as stated in the file 
  * entitled Licensing-Information. 
- * All modifications copyright 2009-2011 Data Access Technologies, Inc. 
+ * 
+ * All modifications copyright 2009-2017 Data Access Technologies, Inc. 
+ * 
  * Licensed under the Academic Free License 
  * version 3.0 (http://www.opensource.org/licenses/afl-3.0.php), except as stated 
  * in the file entitled Licensing-Information. 
- *
- * Contributors:
- *   MDS - initial API and implementation
- *
  */
 
 package org.modeldriven.fuml.library.channel;
@@ -18,6 +16,7 @@
 
 import fUML.Semantics.Classes.Kernel.BooleanValue;
 import fUML.Semantics.Classes.Kernel.IntegerValue;
+import fUML.Semantics.Classes.Kernel.RealValue;
 import fUML.Semantics.Classes.Kernel.StringValue;
 import fUML.Semantics.Classes.Kernel.UnlimitedNaturalValue;
 import fUML.Semantics.CommonBehaviors.BasicBehaviors.ParameterValue;
@@ -36,6 +35,10 @@ public void writeInteger(int value, Status errorStatus) {
         this.writeString(Integer.toString(value), errorStatus);
     }
 
+    public void writeReal(float value, Status errorStatus) {
+        this.writeString(Float.toString(value), errorStatus);
+    }
+
     public void writeBoolean(boolean value, Status errorStatus) {
         this.writeString(Boolean.toString(value), errorStatus);
     }
@@ -75,6 +78,9 @@ public void execute(OperationExecution execution) {
         } else if (name.equals("writeInteger")) {
             this.writeInteger(((IntegerValue) (parameterValue.values.getValue(0))).value, status);
             this.updateStatus(execution, status);
+        } else if (name.equals("writeReal")) {
+            this.writeReal(((RealValue) (parameterValue.values.getValue(0))).value, status);
+            this.updateStatus(execution, status);
         } else if (name.equals("writeBoolean")) {
             this.writeBoolean(((BooleanValue) (parameterValue.values.getValue(0))).value, status);
             this.updateStatus(execution, status);
diff --git a/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/library/common/Status.java b/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/library/common/Status.java
@@ -35,6 +35,10 @@ static public void setStatusType(DataType type) {
 		statusType = type;
 	}
 	
+	public Status() {
+		
+	}
+	
 	public Status(Locus locus, String context, int code, String description) {
 		this.setPrimitiveTypes(locus);
 		this.setStatus(context, code, description);
@@ -60,6 +64,18 @@ public void setStatus(String context, int code, String description) {
 		this.description = description;
 	}
 	
+	public String getContext() {
+		return this.context;
+	}
+	
+	public int getCode() {
+		return this.code;
+	}
+	
+	public String getDescription() {
+		return this.description;
+	}
+	
 	public Value getValue() {
 		DataValue value = new DataValue();
 		DataType statusType = getStatusType();
diff --git a/org.modeldriven.fuml/src/main/resources/org/modeldriven/fuml/library/fUML_Library.xmi b/org.modeldriven.fuml/src/main/resources/org/modeldriven/fuml/library/fUML_Library.xmi
@@ -1282,6 +1282,24 @@
 						/>
 					</ownedParameter>
 				</ownedOperation>
+				<ownedOperation xmi:type="uml:Operation"
+					xmi:id="BasicInputOutput-TextInputChannel-readReal" name="readReal">
+					<ownedParameter xmi:type="uml:Parameter"
+						xmi:id="BasicInputOutput-TextInputChannel-readReal-ReturnResult"
+						name="ReturnResult" direction="return">
+						<type href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#Real"/>
+						<lowerValue xmi:type="uml:LiteralInteger"
+							xmi:id="BasicInputOutput-TextInputChannel-readReal-ReturnResult-_lowerValue"
+						/>
+					</ownedParameter>
+					<ownedParameter xmi:type="uml:Parameter"
+						xmi:id="BasicInputOutput-TextInputChannel-readReal-errorStatus"
+						name="errorStatus" direction="out" type="Common-Status">
+						<lowerValue xmi:type="uml:LiteralInteger"
+							xmi:id="BasicInputOutput-TextInputChannel-readReal-errorStatus-_lowerValue"
+						/>
+					</ownedParameter>
+				</ownedOperation>
 				<ownedOperation xmi:type="uml:Operation"
 					xmi:id="BasicInputOutput-TextInputChannel-readBoolean" name="readBoolean">
 					<ownedParameter xmi:type="uml:Parameter"
@@ -1382,6 +1400,21 @@
 						/>
 					</ownedParameter>
 				</ownedOperation>
+				<ownedOperation xmi:type="uml:Operation"
+					xmi:id="BasicInputOutput-TextOutputChannel-writeReal" name="writeReal">
+					<ownedParameter xmi:type="uml:Parameter"
+						xmi:id="BasicInputOutput-TextOutputChannel-writeReal-value" name="value">
+						<type href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#Real"
+						/>
+					</ownedParameter>
+					<ownedParameter xmi:type="uml:Parameter"
+						xmi:id="BasicInputOutput-TextOutputChannel-writeReal-errorStatus"
+						name="errorStatus" direction="out" type="Common-Status">
+						<lowerValue xmi:type="uml:LiteralInteger"
+							xmi:id="BasicInputOutput-TextOutputChannel-writeReal-errorStatus-_lowerValue"
+						/>
+					</ownedParameter>
+				</ownedOperation>
 				<ownedOperation xmi:type="uml:Operation"
 					xmi:id="BasicInputOutput-TextOutputChannel-writeBoolean" name="writeBoolean">
 					<ownedParameter xmi:type="uml:Parameter"
