Request to merge Specs-2017-09 with master #158

JingyiSu · 2017-09-18T23:19:04Z

Added files and changes to support specifications.

Added SpecCaseProtoTuple.java, SpecDeclarationProtoTuple.java, SpecMethodProtoTuple.java, SpecStatementProtoTuple.java, SpecVariableProtoTuple.java; Made changes on SymbolTable.java, BoaAstIntrinsics.java, DeclarationProtoTuple.java, MethodProtoTuple.java, StatementProtoTuple.java, VariableProtoTuple.java, and ast.proto.

Updated copyright annotations in SymbolTable.java; changed "required" field "key" to "optional" in ast.ptoto; added checking condition for keys in BoaAstIntrinsics.java; changed the identifier number for spec enums start with 1000; removed the code part for keys in DeclarationProtoTuple.java, MethodProtoTuple.java, StatementProtoTuple.java, VariableProtoTuple.java; updated Ast.java.

src/java/boa/functions/BoaAstIntrinsics.java

psybers · 2017-09-19T03:45:11Z

src/java/boa/functions/BoaAstIntrinsics.java


 	@SuppressWarnings("rawtypes")
 	public static void setup(final Context context) {
 		BoaAstIntrinsics.context = context;
 	}
-
+	


remove added space

psybers · 2017-09-19T03:45:41Z

src/java/boa/types/proto/DeclarationProtoTuple.java

+
+		names.put("specs", counter++);
+		members.add(new BoaProtoList(new SpecStatementProtoTuple()));
+


remove blank line at end of block

psybers · 2017-09-19T03:46:09Z

src/java/boa/functions/BoaAstIntrinsics.java

+	@SuppressWarnings("unchecked")
+	@FunctionSpec(name = "getSpec", returnType = "SpecDeclaration", formalParameters = { "Declaration" })
+	public static SpecDeclaration getSpec(final Declaration f) {
+


remove the blank line at the start of this (and all getSpec methods)

psybers · 2017-09-19T03:46:40Z

src/java/boa/types/proto/MethodProtoTuple.java

@@ -1,6 +1,7 @@
 /*
- * Copyright 2014, Hridesh Rajan, Robert Dyer, 


This file no longer needs changes. Please revert all changes so this file is not listed as changed.

psybers · 2017-09-19T03:48:14Z

src/java/boa/types/proto/StatementProtoTuple.java

+
+		names.put("specs", counter++);
+		members.add(new SpecStatementProtoTuple());
+


remove blank line at the end of the block

psybers · 2017-09-19T03:48:27Z

src/java/boa/types/proto/VariableProtoTuple.java

+
+		names.put("specs", counter++);
+		members.add(new SpecStatementProtoTuple());
+


remove blank line at the end of the block

psybers · 2017-09-19T03:50:22Z

src/java/boa/types/proto/VariableProtoTuple.java

@@ -1,6 +1,7 @@
 /*


This file actually shouldnt be changed, because there was no 'specs' attribute added to it. Please revert all changes to this class.

psybers · 2017-09-19T03:51:39Z

src/proto/ast.proto

+
+/** A single method for specification */
+message SpecMethod {
+	repeated SpecCase case = 1;


this should be named 'cases' plural as it is repeated - also update Ast.java and SpecMethodProtoTuple.java

psybers · 2017-09-19T03:52:18Z

src/proto/ast.proto

+/** A single declaration for specification */
+message SpecDeclaration {
+	repeated Modifier modifiers = 1;
+	repeated Statement specs = 2;


this should be named 'statements' - also update Ast.java

JingyiSu · 2017-09-19T19:54:24Z

Have done all the requested changes.

psybers · 2017-09-21T15:56:28Z

src/proto/ast.proto

@@ -67,6 +67,9 @@ message Declaration {
 	optional ChangeKind structural_change_kind = 10;
 	/** Kind of change on the label: UNCHANGED, ADDED, DELETED/REMOVED, RENAMED */
 	optional ChangeKind label_change_kind = 11;
+	/** For Specs use */
+	optional SpecStatement specs = 12;


should this be 'repeated'? Or is there exactly 0 or 1 specification statement per declaration?

based on the naming of 'specs' (plural) I think we intended repeated here.

psybers · 2017-09-21T15:56:52Z

src/proto/ast.proto

@@ -202,6 +237,9 @@ message Statement {
 	optional ChangeKind structural_change_kind = 10;
 	/** Kind of change on the label: UNCHANGED, ADDED, DELETED/REMOVED, RENAMED */
 	optional ChangeKind label_change_kind = 11;
+	/** For Specs use */
+	optional SpecStatement specs = 12;


same thing - 'repeated' or optional?

based on the naming of 'specs' (plural) I think we intended repeated here.

psybers · 2017-09-21T15:57:19Z

src/proto/ast.proto

@@ -67,6 +67,9 @@ message Declaration {
 	optional ChangeKind structural_change_kind = 10;
 	/** Kind of change on the label: UNCHANGED, ADDED, DELETED/REMOVED, RENAMED */
 	optional ChangeKind label_change_kind = 11;
+	/** For Specs use */
+	optional SpecStatement specs = 12;


the field number for spec fields should start at 1000.

Do we need to change the field number for these or only for the enums for specs?

psybers · 2017-09-21T15:57:37Z

src/proto/ast.proto

@@ -202,6 +237,9 @@ message Statement {
 	optional ChangeKind structural_change_kind = 10;
 	/** Kind of change on the label: UNCHANGED, ADDED, DELETED/REMOVED, RENAMED */
 	optional ChangeKind label_change_kind = 11;
+	/** For Specs use */
+	optional SpecStatement specs = 12;


the field number for spec fields should start at 1000.

…nto Specs-2017-09

Made changes in BoaAbstractVisitor.java; Changed the copyright format in SymbolTable.java.

psybers · 2017-09-27T15:16:38Z

Would it make sense to rebase this branch off the datagen branch and merge it in right after?

…ec nodes

JingyiSu and others added 5 commits September 13, 2017 17:20

add missing file

9efadb8

Added missing fields in 2 files

68cd363

Ast.java file related updates

02d9ad9

psybers self-requested a review September 19, 2017 03:42

psybers requested changes Sep 19, 2017

View reviewed changes

psybers added data generation enhancement labels Sep 19, 2017

JingyiSu added 3 commits September 19, 2017 15:45

Specs updates

7e478bc

Updated ast.proto

fab0dd1

Removed added spaces

7f517b1

minor code cleanup

48fda11

psybers requested changes Sep 21, 2017

View reviewed changes

JingyiSu and others added 6 commits September 21, 2017 13:31

Fixed field numbers and modifiers for spec fields

778d1aa

Merge branch 'Specs-2017-09' of https://github.com/boalang/compiler i…

3862b43

…nto Specs-2017-09

Fixed the name for getsepc function

92a818d

Fixed compiling error

18096c6

Made changes in BoaAbstractVisitor.java; Changed the copyright format in SymbolTable.java.

Added author information in BoaAbstractVisitor.java

9d22b36

add test case

f17942c

psybers approved these changes Sep 27, 2017

View reviewed changes

psybers requested a review from nguyenhoan September 27, 2017 15:16

psybers added 3 commits October 4, 2017 00:28

add visit for missing SpecCase, add default visits for children of sp…

c6cdf92

…ec nodes

better handling of null with getspec() and visitors

a685fc5

add test case for specs

fc7b222

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Request to merge Specs-2017-09 with master #158

Request to merge Specs-2017-09 with master #158

JingyiSu commented Sep 18, 2017

psybers Sep 19, 2017

psybers Sep 19, 2017

psybers Sep 19, 2017

psybers Sep 19, 2017

psybers Sep 19, 2017

psybers Sep 19, 2017

psybers Sep 19, 2017

psybers Sep 19, 2017

psybers Sep 19, 2017

JingyiSu commented Sep 19, 2017

psybers Sep 21, 2017

psybers Sep 21, 2017

JingyiSu Sep 21, 2017

psybers Sep 21, 2017

psybers Sep 21, 2017

JingyiSu Sep 21, 2017

psybers Sep 21, 2017

JingyiSu Sep 21, 2017

JingyiSu Sep 21, 2017

psybers Sep 21, 2017

JingyiSu Sep 21, 2017

psybers commented Sep 27, 2017


		names.put("specs", counter++);
		members.add(new BoaProtoList(new SpecStatementProtoTuple()));

		@@ -1,6 +1,7 @@
		/*
		* Copyright 2014, Hridesh Rajan, Robert Dyer,


		names.put("specs", counter++);
		members.add(new SpecStatementProtoTuple());

Request to merge Specs-2017-09 with master #158

Are you sure you want to change the base?

Request to merge Specs-2017-09 with master #158

Conversation

JingyiSu commented Sep 18, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JingyiSu commented Sep 19, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

psybers commented Sep 27, 2017