rpc_progress2

Author: Andrei Pashkin

Makefile

@@ -1,7 +1,8 @@
-PROTOC = protoc
+PROTOC := protoc
 CWD := $(shell pwd)
 PROTOBUF_SRC := $(CWD)/protobuf
 ENTITIES_DIR := $(CWD)/entities
+RPC_DIR := $(CWD)/RPC
 
 # Entities Protobuf definitions generation.
 # Assumes that Entities Protoc-plugin is installed.
@@ -18,12 +19,26 @@ entities-py-test-proto:
 		--entities_out $(ENTITIES_DIR)/python/ \
 		$(wildcard $(ENTITIES_DIR)/python/tests/*.proto) $(wildcard $(ENTITIES_DIR)/python/tests/**/*.proto) $(wildcard $(ENTITIES_DIR)/python/tests/**/**/*.proto)
 
-# Entities: generate entity-classes for Python.
-.PHONY: entities-py-proto
-entities-py-proto:
+# Entities: generate RPC-models for Python.
+$(RPC_DIR)/proto/plugins/python/src/onedrive_client/RPC_protoc_plugins/plugin_pb2.py: $(RPC_DIR)/proto/onedrive_client/RPC_protoc_plugins/plugin.proto
 	$(PROTOC) \
 		--proto_path $(PROTOBUF_SRC)/src \
-		--proto_path $(ENTITIES_DIR)/proto/ \
-		--python_out $(ENTITIES_DIR)/python/src/ \
-		--entities_out=$(ENTITIES_DIR)/python/src/ \
-		$(wildcard $(ENTITIES_DIR)/proto/*.proto) $(wildcard $(ENTITIES_DIR)/proto/**/*.proto) $(wildcard $(ENTITIES_DIR)/proto/**/**/*.proto)
+		--proto_path $(RPC_DIR)/proto/ \
+		--python_out=$(RPC_DIR)/proto/plugins/python/src \
+        $?
+
+.PHONY: RPC-py-models
+RPC-py-models: export RPC_PATH := $(RPC_DIR)/proto
+RPC-py-models: $(RPC_DIR)/proto/plugins/python/src/onedrive_client/RPC_protoc_plugins/plugin_pb2.py
+	$(PROTOC) \
+		--proto_path $(PROTOBUF_SRC)/src \
+		--proto_path $(RPC_DIR)/proto/ \
+		--RPC-models_out=$(RPC_DIR)/python/src/ \
+		$(wildcard $(RPC_DIR)/proto/onedrive_client/RPC/*.proto)
+
+RPC-py-proto:
+	$(PROTOC) \
+		--proto_path $(PROTOBUF_SRC)/src \
+		--proto_path $(RPC_DIR)/proto/ \
+		--python_out=$(RPC_DIR)/python/src/ \
+		$(wildcard $(RPC_DIR)/proto/onedrive_client/RPC/*.proto)

RPC/Expressions.g4

@@ -0,0 +1,34 @@
+/**
+ * Simple boolean expression language.
+ *
+ * Operator precedence
+ *
+ *  1. not
+ *  2. or
+ *  3. and
+ *
+ * Full example:
+ *
+ *   A and not (B or C) or D and not E and false or true
+ */
+grammar Expressions;
+
+root: expr=expression EOF ;
+expression: group
+          | operator=NOT expression
+          | expression (operator=AND expression)+
+          | expression (operator=OR expression)+
+          | IDENTIFIER
+          | literal
+          ;
+group : GROUP_START content=expression GROUP_END ;
+GROUP_START : '(' ;
+GROUP_END : ')' ;
+literal : value=TRUE | value=FALSE ;
+TRUE : 'true' ;
+FALSE : 'false' ;
+AND : 'and' ;
+OR : 'or' ;
+NOT : 'not' ;
+IDENTIFIER : [a-zA-Z_][a-zA-Z0-9_]* ;
+WS : [ \t\r\n]+ -> skip ;