Merge pull request #19 from dart-native/feature/annotation_fix

Fix protocol macro

Author: yulingtianxia

lib/objc/DNObjectiveCContext.js

@@ -380,14 +380,17 @@ class DNPropertyContext extends DNContext {
 class DNProtocolContext extends DNContext {
  constructor(internal) {
  super(internal)
- this.name = internal.children[1].start.text
+ this.name = internal.name.start.text
  this.properties = []
  this.methods = []
  this.protocols = []
+ this.macros = []
+ this.availability = []
  }
 
  parse() {
- var result = 'abstract class ' + this.name
+ var result = this.availability.map((a) => a.parse()).join(' ') + '\n'
+ result += 'abstract class ' + this.name
  if (typeof this.protocols !== 'undefined' && this.protocols.length > 0) {
  result += ' implements ' + this.protocols.join(',')
  }

lib/objc/DNObjectiveCParserListener.js

@@ -834,7 +834,8 @@ class DNObjectiveCParserListener extends ObjectiveCParserListener {
  this.currentContext instanceof DNClassContext ||
  this.currentContext instanceof DNPropertyContext ||
  this.currentContext instanceof DNEnumDefContext ||
- this.currentContext instanceof DNEnumItemContext) {
+ this.currentContext instanceof DNEnumItemContext ||
+ this.currentContext instanceof DNProtocolContext) {
  var name = ctx.start.text
  this.currentContext.macros.push(name)
 

parser/objc/ObjectiveCParser.g4

@@ -90,8 +90,9 @@ genericTypeSpecifier
  ;
 
 protocolDeclaration
- : '@protocol'
- protocolName (LT protocolList GT)? protocolDeclarationSection*
+ : macro* 
+ '@protocol'
+ name = protocolName (LT protocolList GT)? protocolDeclarationSection*
  '@end'
  ;